40 files changed, 2223 insertions, 2198 deletions
diff --git a/CHANGES b/CHANGES
index c38253a80..1a53bf67e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -68,6 +68,8 @@
 	- add rpmdb_{deadlock,dump,load,svc,stat,verify} utilities.
 	- include srpm pkgid in binary headers (#71460).
 	- add %check scriptlet to run after %install (#64137).
+	- simplify specfile query linkage loop.
+	- drill rpmts into parseSpec(), carrying Spec along.
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
diff --git a/build.c b/build.c
index 43df5763d..179970a36 100644
--- a/build.c
+++ b/build.c
@@ -259,12 +259,17 @@ static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
     /* Parse the spec file */
 #define	_anyarch(_f)	\
 (((_f)&(RPMBUILD_PREP|RPMBUILD_BUILD|RPMBUILD_INSTALL|RPMBUILD_PACKAGEBINARY)) == 0)
-    if (parseSpec(&spec, specURL, ba->rootdir, buildRootURL, 0, passPhrase,
-		cookie, _anyarch(buildAmount), ba->force)) {
+    if (parseSpec(ts, specURL, ba->rootdir, buildRootURL, 0, passPhrase,
+		cookie, _anyarch(buildAmount), ba->force))
+    {
 	rc = 1;
 	goto exit;
     }
 #undef	_anyarch
+    if ((spec = rpmtsSetSpec(ts, NULL)) == NULL) {
+	rc = 1;
+	goto exit;
+    }
 
     /* Assemble source header from parsed components */
     initSourceHeader(spec);
diff --git a/build/pack.c b/build/pack.c
index 5d219831d..56400cf14 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -870,10 +870,13 @@ int packageSources(Spec spec)
 		csa, spec->passPhrase, &(spec->cookie));
 	if (rc == 0 && sig != NULL) {
 	    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
-	    const unsigned char * s = NULL;
+	    const unsigned char * md5 = NULL;
+	    rpmTagType type;
+	    int_32 c;
 	    int xx;
-	    xx = hge(sig, RPMSIGTAG_MD5, NULL, (void **)&s, NULL);
-	    spec->sourcePkgId = s;
+	    xx = hge(sig, RPMSIGTAG_MD5, &type, (void **)&md5, &c);
+	    if (type == RPM_BIN_TYPE && md5 != NULL && c == 16)
+		spec->sourcePkgId = memcpy(xmalloc(16), md5, 16);;
 	    sig = headerFree(sig);
 	}
 	csa->cpioFdIn = fdFree(csa->cpioFdIn, "init (packageSources)");
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 72eb34af9..147c03a05 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -389,7 +389,7 @@ extern int noLang;		/* XXX FIXME: pass as arg */
 
 /*@todo Skip parse recursion if os is not compatible. @*/
 /*@-boundswrite@*/
-int parseSpec(Spec *specp, const char *specFile, const char *rootURL,
+int parseSpec(rpmts ts, const char *specFile, const char *rootURL,
 		const char *buildRootURL, int recursing, const char *passPhrase,
 		char *cookie, int anyarch, int force)
 {
@@ -428,8 +428,6 @@ int parseSpec(Spec *specp, const char *specFile, const char *rootURL,
 	spec->gotBuildRootURL = 1;
 	spec->buildRootURL = xstrdup(buildRootURL);
 	addMacro(spec->macros, "buildroot", NULL, buildRoot, RMIL_SPEC);
-if (_debug)
-fprintf(stderr, "*** PS buildRootURL(%s) %p macro set to %s\n", spec->buildRootURL, spec->buildRootURL, buildRoot);
     }
     addMacro(NULL, "_docdir", NULL, "%{_defaultdocdir}", RMIL_SPEC);
     spec->recursing = recursing;
@@ -521,9 +519,9 @@ fprintf(stderr, "*** PS buildRootURL(%s) %p macro set to %s\n", spec->buildRootU
 		addMacro(NULL, "_target_cpu", NULL, spec->BANames[x], RMIL_RPMRC);
 #endif
 		spec->BASpecs[index] = NULL;
-		if (parseSpec(&(spec->BASpecs[index]),
-				  specFile, spec->rootURL, buildRootURL, 1,
-				  passPhrase, cookie, anyarch, force))
+		if (parseSpec(ts, specFile, spec->rootURL, buildRootURL, 1,
+				  passPhrase, cookie, anyarch, force)
+		 || (spec->BASpecs[index] = rpmtsSetSpec(ts, NULL)) == NULL)
 		{
 			spec->BACount = index;
 			spec = freeSpec(spec);
@@ -564,7 +562,7 @@ fprintf(stderr, "*** PS buildRootURL(%s) %p macro set to %s\n", spec->buildRootU
 	    }
 	    /*@=branchstate@*/
 
-	    *specp = spec;
+	    (void) rpmtsSetSpec(ts, spec);
 	    return 0;
 	}
     }
@@ -626,7 +624,7 @@ fprintf(stderr, "*** PS buildRootURL(%s) %p macro set to %s\n", spec->buildRootU
   }
 
     closeSpec(spec);
-    *specp = spec;
+    (void) rpmtsSetSpec(ts, spec);
 
     return 0;
 }
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 2eafbb26c..d1dd71cce 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -453,7 +453,7 @@ int processSourceFiles(Spec spec)
 
 /** \ingroup rpmbuild
  * Parse spec file into spec control structure.
- * @retval specp	spec file control structure
+ * @param ts		transaction set (spec file control in ts->spec)
  * @param specFile
  * @param rootURL
  * @param buildRootURL
@@ -464,7 +464,7 @@ int processSourceFiles(Spec spec)
  * @param force
  * @return
  */
-int parseSpec(/*@out@*/ Spec * specp, const char * specFile,
+int parseSpec(rpmts ts, const char * specFile,
 		/*@null@*/ const char * rootURL,
 		/*@null@*/ const char * buildRootURL,
 		int recursing,
@@ -477,32 +477,6 @@ int parseSpec(/*@out@*/ Spec * specp, const char * specFile,
 		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
- * @retval specp	spec file control structure
- * @param specFile
- * @param rootdir
- * @param buildRoot
- * @param recursing	parse is recursive?
- * @param passPhrase
- * @param cookie
- * @param anyarch
- * @param force
- * @return
- */
-/*@-declundef@*/
-extern int (*parseSpecVec) (Spec * specp, const char * specFile,
-		const char * rootdir,
-		/*@null@*/ const char * buildRoot,
-		int recursing,
-		/*@null@*/ const char * passPhrase,
-		/*@null@*/ char * cookie,
-		int anyarch, int force)
-	/*@globals rpmGlobalMacroContext,
-		fileSystem, internalState @*/
-	/*@modifies *specp,
-		rpmGlobalMacroContext, fileSystem, internalState @*/;
-/*@=declundef@*/
-
-/** \ingroup rpmbuild
  * Build stages state machine driver.
  * @param spec		spec file control structure
  * @param what		bit(s) to enable stages of build
@@ -513,8 +487,8 @@ int buildSpec(Spec spec, int what, int test)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 	/*@modifies spec->sourceHeader, spec->sourceCpioList, spec->cookie,
-		spec->sourceRpmName, spec->macros,
-		spec->BASpecs,
+		spec->sourceRpmName, spec->sourcePkgId,
+		spec->macros, spec->BASpecs,
 		spec->buildRestrictions, spec->BANames,
 		spec->packages->cpioList, spec->packages->fileList,
 		spec->packages->specialDoc, spec->packages->header,
@@ -541,7 +515,7 @@ int packageSources(Spec spec)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 	/*@modifies spec->sourceHeader, spec->cookie,
-		spec->sourceRpmName,
+		spec->sourceRpmName, spec->sourcePkgId,
 		rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /*@=redecl@*/
diff --git a/build/rpmspec.h b/build/rpmspec.h
index 1f04558f9..5bfec8d59 100644
--- a/build/rpmspec.h
+++ b/build/rpmspec.h
@@ -8,10 +8,6 @@
 
 /** \ingroup rpmbuild
  */
-typedef struct Spec_s * Spec;
-
-/** \ingroup rpmbuild
- */
 typedef struct Package_s * Package;
 
 /** \ingroup rpmbuild
@@ -235,14 +231,17 @@ extern "C" {
 	/*@modifies spec, fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
- * @param spec		spec file control structure
- * @return		NULL always
+ * Function to query spec file(s).
+ * @param ts		transaction set
+ * @param qva		parsed query/verify options
+ * @param arg		query argument
+ * @return		0 on success, else no. of failures
  */
-/*@-declundef@*/
-extern /*@null@*/ Spec (*freeSpecVec) (Spec spec)	/* XXX FIXME */
-	/*@globals fileSystem, internalState @*/
-	/*@modifies spec, fileSystem, internalState @*/;
-/*@=declundef@*/
+int rpmspecQuery(rpmts ts, QVA_t qva, const char * arg)
+        /*@globals rpmGlobalMacroContext,
+                fileSystem, internalState @*/
+        /*@modifies ts, qva, rpmGlobalMacroContext,
+                fileSystem, internalState @*/;
 
 /** \ingroup rpmbuild
  */
diff --git a/build/spec.c b/build/spec.c
index 686d90487..e162ce012 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -7,6 +7,7 @@
 
 #include "buildio.h"
 #include "rpmfi.h"
+#include "rpmts.h"
 
 #include "debug.h"
 
@@ -555,7 +556,8 @@ Spec freeSpec(Spec spec)
     return spec;
 }
 
-/*@only@*/ struct OpenFileInfo * newOpenFileInfo(void)
+/*@only@*/
+struct OpenFileInfo * newOpenFileInfo(void)
 {
     struct OpenFileInfo *ofi;
 
@@ -571,3 +573,159 @@ Spec freeSpec(Spec spec)
 
     return ofi;
 }
+
+/**
+ * Print copy of spec file, filling in Group/Description/Summary from specspo.
+ * @param spec		spec file control structure
+ */
+static void
+printNewSpecfile(Spec spec)
+	/*@globals fileSystem @*/
+	/*@modifies spec->sl->sl_lines[], fileSystem @*/
+{
+    Header h;
+    speclines sl = spec->sl;
+    spectags st = spec->st;
+    const char * msgstr = NULL;
+    int i, j;
+
+    if (sl == NULL || st == NULL)
+	return;
+
+    /*@-branchstate@*/
+    for (i = 0; i < st->st_ntags; i++) {
+	spectag t = st->st_t + i;
+	const char * tn = tagName(t->t_tag);
+	const char * errstr;
+	char fmt[1024];
+
+	fmt[0] = '\0';
+	if (t->t_msgid == NULL)
+	    h = spec->packages->header;
+	else {
+	    Package pkg;
+	    char *fe;
+
+/*@-bounds@*/
+	    strcpy(fmt, t->t_msgid);
+	    for (fe = fmt; *fe && *fe != '('; fe++)
+		{} ;
+	    if (*fe == '(') *fe = '\0';
+/*@=bounds@*/
+	    h = NULL;
+	    for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
+		const char *pkgname;
+		h = pkg->header;
+		(void) headerNVR(h, &pkgname, NULL, NULL);
+		if (!strcmp(pkgname, fmt))
+		    /*@innerbreak@*/ break;
+	    }
+	    if (pkg == NULL || h == NULL)
+		h = spec->packages->header;
+	}
+
+	if (h == NULL)
+	    continue;
+
+	fmt[0] = '\0';
+/*@-boundswrite@*/
+	(void) stpcpy( stpcpy( stpcpy( fmt, "%{"), tn), "}");
+/*@=boundswrite@*/
+	msgstr = _free(msgstr);
+
+	/* XXX this should use queryHeader(), but prints out tn as well. */
+	msgstr = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr);
+	if (msgstr == NULL) {
+	    rpmError(RPMERR_QFMT, _("can't query %s: %s\n"), tn, errstr);
+	    return;
+	}
+
+/*@-boundswrite@*/
+	switch(t->t_tag) {
+	case RPMTAG_SUMMARY:
+	case RPMTAG_GROUP:
+	    /*@-unqualifiedtrans@*/
+	    sl->sl_lines[t->t_startx] = _free(sl->sl_lines[t->t_startx]);
+	    /*@=unqualifiedtrans@*/
+	    if (t->t_lang && strcmp(t->t_lang, RPMBUILD_DEFAULT_LANG))
+		continue;
+	    {   char *buf = xmalloc(strlen(tn) + sizeof(": ") + strlen(msgstr));
+		(void) stpcpy( stpcpy( stpcpy(buf, tn), ": "), msgstr);
+		sl->sl_lines[t->t_startx] = buf;
+	    }
+	    /*@switchbreak@*/ break;
+	case RPMTAG_DESCRIPTION:
+	    for (j = 1; j < t->t_nlines; j++) {
+		if (*sl->sl_lines[t->t_startx + j] == '%')
+		    /*@innercontinue@*/ continue;
+		/*@-unqualifiedtrans@*/
+		sl->sl_lines[t->t_startx + j] =
+			_free(sl->sl_lines[t->t_startx + j]);
+		/*@=unqualifiedtrans@*/
+	    }
+	    if (t->t_lang && strcmp(t->t_lang, RPMBUILD_DEFAULT_LANG)) {
+		sl->sl_lines[t->t_startx] = _free(sl->sl_lines[t->t_startx]);
+		continue;
+	    }
+	    sl->sl_lines[t->t_startx + 1] = xstrdup(msgstr);
+	    if (t->t_nlines > 2)
+		sl->sl_lines[t->t_startx + 2] = xstrdup("\n\n");
+	    /*@switchbreak@*/ break;
+	}
+/*@=boundswrite@*/
+    }
+    /*@=branchstate@*/
+    msgstr = _free(msgstr);
+
+/*@-boundsread@*/
+    for (i = 0; i < sl->sl_nlines; i++) {
+	const char * s = sl->sl_lines[i];
+	if (s == NULL)
+	    continue;
+	printf("%s", s);
+	if (strchr(s, '\n') == NULL && s[strlen(s)-1] != '\n')
+	    printf("\n");
+    }
+/*@=boundsread@*/
+}
+
+int rpmspecQuery(rpmts ts, QVA_t qva, const char * arg)
+{
+    Spec spec = NULL;
+    Package pkg;
+    char * buildRoot = NULL;
+    int recursing = 0;
+    char * passPhrase = "";
+    char *cookie = NULL;
+    int anyarch = 1;
+    int force = 1;
+    int res = 1;
+    int xx;
+
+    if (qva->qva_showPackage == NULL)
+	goto exit;
+
+    /*@-mods@*/ /* FIX: make spec abstract */
+    if (parseSpec(ts, arg, "/", buildRoot, recursing, passPhrase,
+		cookie, anyarch, force)
+      || (spec = rpmtsSetSpec(ts, NULL)) == NULL)
+    {
+	rpmError(RPMERR_QUERY,
+	    		_("query of specfile %s failed, can't parse\n"), arg);
+	goto exit;
+    }
+    /*@=mods@*/
+
+    res = 0;
+    if (specedit) {
+	printNewSpecfile(spec);
+	goto exit;
+    }
+
+    for (pkg = spec->packages; pkg != NULL; pkg = pkg->next)
+	xx = qva->qva_showPackage(qva, ts, pkg->header);
+
+exit:
+    spec = freeSpec(spec);
+    return res;
+}
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e3385f6bf..4ab3fadee 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -70,9 +70,9 @@ getdate.c: getdate.y
 
 BUILT_SOURCES = getdate.c # rpmlib.lcd
 
-noinst_PROGRAMS = tds
-tds_SOURCES =	tds.c
-tds_LDFLAGS =	@LDFLAGS_STATIC@ ./librpm.la
+#noinst_PROGRAMS = tds
+#tds_SOURCES =	tds.c
+#tds_LDFLAGS =	@LDFLAGS_STATIC@ ./librpm.la
 
 rpmlib.lcd: Makefile.am ${librpm_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}
 	-lclint ${DEFS} ${INCLUDES} ${librpm_la_SOURCES} -dump $@ 2>/dev/null
diff --git a/lib/query.c b/lib/query.c
index 00fdcf78f..c9ca7d1ff 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -12,7 +12,6 @@
 #endif
 
 #include <rpmcli.h>
-#include <rpmbuild.h>
 
 #include "rpmdb.h"
 #include "rpmfi.h"
@@ -343,121 +342,6 @@ exit:
     return rc;
 }
 
-/**
- * Print copy of spec file, filling in Group/Description/Summary from specspo.
- * @param spec		spec file control structure
- */
-static void
-printNewSpecfile(Spec spec)
-	/*@globals fileSystem @*/
-	/*@modifies spec->sl->sl_lines[], fileSystem @*/
-{
-    Header h;
-    speclines sl = spec->sl;
-    spectags st = spec->st;
-    const char * msgstr = NULL;
-    int i, j;
-
-    if (sl == NULL || st == NULL)
-	return;
-
-    /*@-branchstate@*/
-    for (i = 0; i < st->st_ntags; i++) {
-	spectag t = st->st_t + i;
-	const char * tn = tagName(t->t_tag);
-	const char * errstr;
-	char fmt[1024];
-
-	fmt[0] = '\0';
-	if (t->t_msgid == NULL)
-	    h = spec->packages->header;
-	else {
-	    Package pkg;
-	    char *fe;
-
-/*@-bounds@*/
-	    strcpy(fmt, t->t_msgid);
-	    for (fe = fmt; *fe && *fe != '('; fe++)
-		{} ;
-	    if (*fe == '(') *fe = '\0';
-/*@=bounds@*/
-	    h = NULL;
-	    for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-		const char *pkgname;
-		h = pkg->header;
-		(void) headerNVR(h, &pkgname, NULL, NULL);
-		if (!strcmp(pkgname, fmt))
-		    /*@innerbreak@*/ break;
-	    }
-	    if (pkg == NULL || h == NULL)
-		h = spec->packages->header;
-	}
-
-	if (h == NULL)
-	    continue;
-
-	fmt[0] = '\0';
-/*@-boundswrite@*/
-	(void) stpcpy( stpcpy( stpcpy( fmt, "%{"), tn), "}");
-/*@=boundswrite@*/
-	msgstr = _free(msgstr);
-
-	/* XXX this should use queryHeader(), but prints out tn as well. */
-	msgstr = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr);
-	if (msgstr == NULL) {
-	    rpmError(RPMERR_QFMT, _("can't query %s: %s\n"), tn, errstr);
-	    return;
-	}
-
-/*@-boundswrite@*/
-	switch(t->t_tag) {
-	case RPMTAG_SUMMARY:
-	case RPMTAG_GROUP:
-	    /*@-unqualifiedtrans@*/
-	    sl->sl_lines[t->t_startx] = _free(sl->sl_lines[t->t_startx]);
-	    /*@=unqualifiedtrans@*/
-	    if (t->t_lang && strcmp(t->t_lang, RPMBUILD_DEFAULT_LANG))
-		continue;
-	    {   char *buf = xmalloc(strlen(tn) + sizeof(": ") + strlen(msgstr));
-		(void) stpcpy( stpcpy( stpcpy(buf, tn), ": "), msgstr);
-		sl->sl_lines[t->t_startx] = buf;
-	    }
-	    /*@switchbreak@*/ break;
-	case RPMTAG_DESCRIPTION:
-	    for (j = 1; j < t->t_nlines; j++) {
-		if (*sl->sl_lines[t->t_startx + j] == '%')
-		    /*@innercontinue@*/ continue;
-		/*@-unqualifiedtrans@*/
-		sl->sl_lines[t->t_startx + j] =
-			_free(sl->sl_lines[t->t_startx + j]);
-		/*@=unqualifiedtrans@*/
-	    }
-	    if (t->t_lang && strcmp(t->t_lang, RPMBUILD_DEFAULT_LANG)) {
-		sl->sl_lines[t->t_startx] = _free(sl->sl_lines[t->t_startx]);
-		continue;
-	    }
-	    sl->sl_lines[t->t_startx + 1] = xstrdup(msgstr);
-	    if (t->t_nlines > 2)
-		sl->sl_lines[t->t_startx + 2] = xstrdup("\n\n");
-	    /*@switchbreak@*/ break;
-	}
-/*@=boundswrite@*/
-    }
-    /*@=branchstate@*/
-    msgstr = _free(msgstr);
-
-/*@-boundsread@*/
-    for (i = 0; i < sl->sl_nlines; i++) {
-	const char * s = sl->sl_lines[i];
-	if (s == NULL)
-	    continue;
-	printf("%s", s);
-	if (strchr(s, '\n') == NULL && s[strlen(s)-1] != '\n')
-	    printf("\n");
-    }
-/*@=boundsread@*/
-}
-
 void rpmDisplayQueryTags(FILE * fp)
 {
     const struct headerTagTableEntry_s * t;
@@ -516,19 +400,6 @@ static inline unsigned char nibble(char c)
     return 0;
 }
 
-/*@-redecl@*/
-/**
- * @todo Eliminate linkage loop into librpmbuild.a
- */
-int	(*parseSpecVec) (Spec *specp, const char *specFile, const char *rootdir,
-		const char *buildRoot, int recursing, const char *passPhrase,
-		char *cookie, int anyarch, int force) = NULL;
-/**
- * @todo Eliminate linkage loop into librpmbuild.a
- */
-/*@null@*/ Spec	(*freeSpecVec) (Spec spec) = NULL;
-/*@=redecl@*/
-
 /*@-bounds@*/ /* LCL: segfault (realpath annotation?) */
 int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
 {
@@ -536,7 +407,6 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
     int res = 0;
     Header h;
     int rc;
-    int xx;
     const char * s;
     int i;
 
@@ -646,45 +516,9 @@ restart:
     }	break;
 
     case RPMQV_SPECFILE:
-	if (qva->qva_showPackage != showQueryPackage)
-	    return 1;
-
-	/* XXX Eliminate linkage dependency loop */
-	if (parseSpecVec == NULL || freeSpecVec == NULL)
-	    return 1;
-
-      { Spec spec = NULL;
-	Package pkg;
-	char * buildRoot = NULL;
-	int recursing = 0;
-	char * passPhrase = "";
-	char *cookie = NULL;
-	int anyarch = 1;
-	int force = 1;
-
-	/*@-mods@*/ /* FIX: make spec abstract */
-	rc = parseSpecVec(&spec, arg, "/", buildRoot, recursing, passPhrase,
-		cookie, anyarch, force);
-	/*@=mods@*/
-	if (rc || spec == NULL) {
-	    rpmError(RPMERR_QUERY,
-	    		_("query of specfile %s failed, can't parse\n"), arg);
-	    spec = freeSpecVec(spec);
-	    res = 1;
-	    break;
-	}
-
-	if (specedit) {
-	    printNewSpecfile(spec);
-	    spec = freeSpecVec(spec);
-	    res = 0;
-	    break;
-	}
-
-	for (pkg = spec->packages; pkg != NULL; pkg = pkg->next)
-	    xx = qva->qva_showPackage(qva, ts, pkg->header);
-	spec = freeSpecVec(spec);
-      }	break;
+	res = ((qva->qva_specQuery != NULL)
+		? qva->qva_specQuery(ts, qva, arg) : 1);
+	break;
 
     case RPMQV_ALL:
 	qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
diff --git a/lib/rpmal.c b/lib/rpmal.c
index af0d9469e..963e2a137 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -781,8 +781,10 @@ rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds, alKey * keyp)
 	    ret = xrealloc(ret, (found + 2) * sizeof(*ret));
 	    if (ret)	/* can't happen */
 		ret[found] = alp->key;
+/*@-dependenttrans@*/
 	    if (keyp)
 		*keyp = match->pkgKey;
+/*@=dependenttrans@*/
 	    found++;
 	}
 	/*@=branchstate@*/
@@ -791,7 +793,9 @@ rpmalAllSatisfiesDepend(const rpmal al, const rpmds ds, alKey * keyp)
     if (ret)
 	ret[found] = NULL;
 
+/*@-nullstate@*/ /* FIX: *kep may be NULL */
     return ret;
+/*@=nullstate@*/
 }
 
 fnpyKey
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 97a531ab2..707a0aa60 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -230,6 +230,20 @@ typedef	int (*QVF_t) (QVA_t qva, rpmts ts, Header h)
 	/*@modifies qva, ts, fileSystem @*/;
 
 /** \ingroup rpmcli
+ * Function to query spec file.
+ *
+ * @param ts		transaction set
+ * @param qva		parsed query/verify options
+ * @param arg		query argument
+ * @return		0 on success
+ */
+typedef	int (*QSpecF_t) (rpmts ts, QVA_t qva, const char * arg)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
+	/*@modifies ts, qva, rpmGlobalMacroContext,
+		fileSystem, internalState @*/;
+
+/** \ingroup rpmcli
  * Describe query/verify/signature command line operation.
  */
 struct rpmQVKArguments_s {
@@ -241,6 +255,8 @@ struct rpmQVKArguments_s {
     rpmdbMatchIterator qva_mi;	/*!< Match iterator on selected headers. */
 /*@null@*/
     QVF_t qva_showPackage;	/*!< Function to display iterator matches. */
+/*@null@*/
+    QSpecF_t qva_specQuery;	/*!< Function to query spec file. */
 /*@unused@*/
     int qva_verbose;		/*!< (unused) */
 /*@only@*/ /*@null@*/
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 8e8ad93d1..16d9a8810 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -67,6 +67,10 @@ void * _free(/*@only@*/ /*@null@*/ /*@out@*/ const void * p)
  */
 typedef /*@abstract@*/ /*@refcounted@*/ struct rpmts_s * rpmts;
 
+/** \ingroup rpmbuild
+ */
+typedef struct Spec_s * Spec;
+
 /** \ingroup rpmtrans
  * An added/available package retrieval key.
  */
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 78cc162f5..24c946395 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -34,11 +34,7 @@ void rpmteCleanDS(rpmte te)
 
 /**
  * Destroy transaction element data.
- * @param ts		transaction set
  * @param p		transaction element
- * @param h		header
- * @param key		(TR_ADDED) package retrieval key (e.g. file name)
- * @param relocs	(TR_ADDED) package file relocations
  */
 static void delTE(rpmte p)
 	/*@globals fileSystem @*/
diff --git a/lib/rpmts.c b/lib/rpmts.c
index ea18568c8..38606e018 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -1101,6 +1101,18 @@ rpmtransFlags rpmtsSetFlags(rpmts ts, rpmtransFlags transFlags)
     return otransFlags;
 }
 
+Spec rpmtsSpec(rpmts ts)
+{
+    return ts->spec;
+}
+
+Spec rpmtsSetSpec(rpmts ts, Spec spec)
+{
+    Spec ospec = ts->spec;
+    ts->spec = spec;
+    return ospec;
+}
+
 int rpmtsSetNotifyCallback(rpmts ts,
 		rpmCallbackFunction notify, rpmCallbackData notifyData)
 {
diff --git a/lib/rpmts.h b/lib/rpmts.h
index 080c65fe4..ddcd6a4e1 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -190,6 +190,9 @@ struct rpmts_s {
 /*@null@*/
     pgpDig dig;			/*!< Current signature/pubkey parameters. */
 
+/*@null@*/
+    Spec spec;			/*!< Spec file control structure. */
+
 /*@refs@*/
     int nrefs;			/*!< Reference count. */
 
@@ -734,6 +737,23 @@ rpmtransFlags rpmtsSetFlags(rpmts ts, rpmtransFlags transFlags)
 	/*@modifies ts @*/;
 
 /** \ingroup rpmts
+ * Get spec control structure from transaction set.
+ * @param ts		transaction set
+ * @return		spec control structure
+ */
+Spec rpmtsSpec(rpmts ts)
+	/*@*/;
+
+/** \ingroup rpmts
+ * Set a spec control structure in transaction set.
+ * @param ts		transaction set
+ * @param spec		new spec control structure
+ * @return		previous spec control structure
+ */
+Spec rpmtsSetSpec(rpmts ts, /*@null@*/ Spec spec)
+	/*@modifies ts @*/;
+
+/** \ingroup rpmts
  * Set transaction notify callback function and argument.
  *
  * @warning This call must be made before rpmtsRun() for
diff --git a/po/cs.po b/po/cs.po
index 02dd6631d..1dc7434b0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -51,12 +51,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "Nezd� se, �e by %s byl spec soubor.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Sestavuji c�lov� platformy: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Sestavuji pro c�l %s\n"
@@ -125,112 +125,112 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Tento program lze voln� ���it podle podm�nek GNU GPL."
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern� chyba p�i zpracov�n� parametr� (%d) :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "specifikovat lze jen jeden hlavn� re�im"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "najednou lze prov�st jen jeden typ dotazu �i ov��en�"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "neo�ek�van� p��znak pro dotaz"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "neo�ek�van� form�t dotazu"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "neo�ek�van� zdroj dotazu"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "vynucena m��e b�t jen instalace, aktualizace, smaz�n� zdrojov�ch k�d� a spec "
 "souboru"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "soubory mohou b�t p�em�st�ny jen p�i instalaci bal��k�"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate a --excludepath je mo�no pou��t jen p�i instalaci nov�ch bal��k�"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix je mo�no pou��t jen p�i instalaci nov�ch bal��k�"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametry pro --prefix musej� za��nat znakem /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "pou��t lze jen jeden z parametr� --excludedocs a --includedocs"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles m��e b�t pou�it jen p�i instalaci bal��k�"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb m��e b�t pou�it jen p�i instalaci a odstra�ov�n� bal��k�"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -238,7 +238,7 @@ msgstr ""
 "volba pro potla�en� skript� m��e b�t pou�ita jen p�i instalaci nebo p�i "
 "odstra�ov�n� bal��k�"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -246,7 +246,7 @@ msgstr ""
 "volba pro potla�en� trigger� m��e b�t pou�ita jen p�i instalaci nebo "
 "odstra�ov�n� bal��k�"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -254,13 +254,13 @@ msgstr ""
 "--nodeps m��e b�t pou�it jen p�i sestavov�n�, rekompilaci, instalaci, "
 "odstra�ov�n� a kontrole"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test m��e b�t pou�it jen p�i instalaci, odstra�ov�n� a sestavov�n�"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -268,78 +268,78 @@ msgstr ""
 "--root (-r) m��e b�t pou�it jen p�i instalaci, odstra�ov�n�, dotazech nebo "
 "znovuvytvo�en� datab�ze"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametry pro --root (-r) musej� za��nat znakem /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "��dn� soubory k podeps�n�\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "p��stup k souboru %s se nezda�il\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp nenalezeno: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "Vlo�te heslovou fr�zi: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Chybn� heslov� fr�ze\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Heslov� fr�ze je v po��dku.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "�patn� %%_signature spec v souboru maker.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign m��e b�t pou�it jen p�i sestavov�n� bal��k�"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "spu�t�n� selhalo\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "ke znovusestaven� nezad�ny ��dn� bal��ky"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "pro sestaven� nezad�ny ��dn� spec soubory"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "pro sestaven� nezad�ny ��dn� tar soubory"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nezad�ny ��dn� bal��ky pro instalaci"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "nezad�ny ��dn� bal��ky pro instalaci"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "k dotazu nezad�ny ��dn� parametry"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezad�ny ��dn� bal��ky"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "k dotazu nezad�ny ��dn� parametry"
@@ -1098,11 +1098,11 @@ msgstr "%s:%d: %%endif bez po��te�n�ho %%if\n"
 msgid "malformed %%include statement\n"
 msgstr "po�kozen� p��kaz %%include\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr "Nenalezeny ��dn� kompatibiln� architektury pro sestaven�\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Bal��ek nem� ��dn� %%description: %s\n"
@@ -1278,21 +1278,31 @@ msgstr "c�lov� platforma p�edefinov�na"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "vyhledat i18N �et�zce ve specfile katalogu"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "��dek %d: �patn� ��slo: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "��dek %d: �patn� ��slo %s: %d\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "��dek %d: �patn� ��slo %s: %s\n"
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr "nemohu prov�st dotaz %s: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2228,141 +2238,131 @@ msgstr "nemohu otev��t %s: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "nespr�vn� form�t: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(neobsahuje ��dn� soubory)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "norm�ln�      "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "nahrazen      "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "neinstalov�n  "
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "sd�len v s�ti "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(chyb� stav)  "
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(nezn�m� %3d) "
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "bal��ek nem� vlastn�ka souboru ani seznamy id\n"
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr "bal��ek nem� vlastn�ka souboru ani seznamy id\n"
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr "nemohu prov�st dotaz %s: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otev�en� %s selhalo: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "dotaz na %s se nezda�il\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "nelze prov�st dotaz na zdrojov� bal��ky star�ho form�tu\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "��dn� bal��ek neaktivuje %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr "��dn� bal��ky\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ��dn� bal��ky\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "��dn� bal��ek neaktivuje %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "nemohu zjistit stav %s: %s\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "��dn� bal��ek neaktivuje %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "��dn� bal��ek nevy�aduje %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "��dn� bal��ek neposkytuje %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "soubor %s nevlastn� ��dn� bal��ek\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neplatn� ��slo bal��ku: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr "z�znam bal��ku ��slo: %u\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "z�znam %u nelze p�e��st\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "bal��ek %s nen� nainstalov�n\n"
diff --git a/po/da.po b/po/da.po
index 53b577a13..70574be54 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -52,12 +52,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "Filen %s synes ikke at v�re en spec-fil.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Opbygger m�l-platforme: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Opbygger for m�l %s\n"
@@ -125,123 +125,123 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Dette program kan frit distribueres under betingelserne i GNU GPL"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "kun �t hovedtilvalg kan angives"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "kun �n af foresp�rgsel/verific�r kan udf�res ad gangen"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "uventet foresp�rgselsflag"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "uventet foresp�rgselsformat"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "uventet foresp�rgselskilde"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omrokeres under installation"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate og --excludepath kan kun bruges, n�r nye pakker installeres"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun bruges, n�r nye pakker installeres"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametre til --prefix skal starte med et /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun angives ved installation"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun angives ved installation"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan kun angives ved installation"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan kun angives ved installation"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan kun angives ved installation"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan kun angives ved installation"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "kun �n af --excludedocs og --includedocs kan angives"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan kun angives ved installation"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan kun angives ved installation"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan kun angives ved installation"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan kun angives ved installation"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan kun angives ved installation"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--notriggers kan kun angives ved installation og sletning af pakker"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -249,13 +249,13 @@ msgstr ""
 "--nodeps kan kun angives ved opbygning, genopbygning, genovers�ttelse, "
 "installation, sletning og verifikation"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test kan kun angives ved installation, sletning og opbygning"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -263,78 +263,78 @@ msgstr ""
 "--root (-r) kan kun angives ved installation, sletning, foresp�rgsel og "
 "genopbygning af databasen"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parameteren til --root (-r) skal starte med et /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "ingen filer at underskrive\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan ikke tilg� filen %s\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp ikke fundet: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "Indtast adgangskode: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Adgangskode ikke godkendt\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Adgangskode godkendt.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Ugyldig angivelse af %%_signature i makrofil.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign kan kun bruges ved pakkeopbygning"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "eksekvering mislykkedes\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler angivet til genopbygning"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "ingen spec-fil angivet til opbygning"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "ingen tar-arkiver angivet til opbygning"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "ingen parametre angivet ved foresp�rgsel"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "ingen parametre angivet ved verifikation"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved foresp�rgsel"
@@ -1097,12 +1097,12 @@ msgstr "%s:%d: Fik et %%endif uden et %%if\n"
 msgid "malformed %%include statement\n"
 msgstr "forkert udf�rt '%%include'-kommando\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen arkitekturer, der kan opbygges\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakke har ingen %%description: %s\n"
@@ -1278,21 +1278,31 @@ msgstr "gennemtving m�lplatform"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "sl� i18N-strenge op i spec-fil katalog"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "linie %d: Ugyldigt tal: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "linie %d: Ugyldigt 'no%s'-tal: %d\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linie %d: Ugyldigt %s-tal: %s\n"
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr "kunne ikke foresp�rge %s: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "foresp�rgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2241,141 +2251,131 @@ msgstr "kunne ikke �bne %s: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ugyldigt format: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(indeholder ingen filer)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "erstattet     "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "ej installeret"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "ej delt       "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(ingen status)"
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ukendt %3d)  "
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr "kunne ikke foresp�rge %s: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "�bning af %s mislykkedes %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "foresp�rgsel af %s mislykkedes\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "pakke med gammelt kildeformat kan ikke foresp�rges\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "ingen pakker udl�ser %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "foresp�rgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s indeholder ingen pakker\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakker udl�ser %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Kunne ikke l�se %s: %s.\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "ingen pakker udl�ser %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakker kr�ver %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakker tilf�rer %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tilh�rer ingen pakke\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr "pakkens post-nummer: %u\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "post %d kunne ikke l�ses\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
diff --git a/po/de.po b/po/de.po
index a12cc95d1..61032a2c1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -92,12 +92,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s scheint kein RPM-Paket zu sein\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:334
+#: build.c:339
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
@@ -168,119 +168,119 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Dies darf unter den Bedingungen der �GNU GPL� frei verteilt werden"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "Es darf nur ein Hauptmodus angegeben werden"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 "Nur nur eine Art der Anfrage/�berpr�fung kann pro Programmlauf durchgef�hrt "
 "werden"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "Dateien k�nnen nur w�hrend der Paketinstallation verschoben werden"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "Argumente zu --prefix m�ssen mit einem / beginnen"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches darf nur w�hrend der Paketdeinstallaiton angegeben werden"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles darf nur w�hrend der Paketinstallation angegeben werden"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kann nur w�hrend der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -289,7 +289,7 @@ msgstr ""
 "--justdb kann nur w�hrend der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -298,7 +298,7 @@ msgstr ""
 "--justdb kann nur w�hrend der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -307,7 +307,7 @@ msgstr ""
 "--nodeps darf nur w�hrend der Paketinstallation, -deinstallation und -"
 "�berpr�fung angegeben werden"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -315,7 +315,7 @@ msgstr ""
 "--test darf nur w�hrend der Paketinstallation, -deinstallation und -"
 "erstellung angegeben werden"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -323,80 +323,80 @@ msgstr ""
 "--root (-r) darf nur w�hrend der Paketinstallation, -deinstallation, -"
 "anfrage und Datenbankneuerstellungen angegeben werden"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "Argumente zu --root (-r) m�ssen mit einem / beginnen"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "kann Datei %s nicht �ffnen: "
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Die Passwort�berpr�fung ist fehlgeschlagen\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Das Passwort ist richtig.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign darf nur w�hrend der Paketerstellung benutzt werden"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: �ffnen fehlgeschlagen\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paketdateien f�r die Neuerstellung angegeben"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "Es wurde kein spec-Datei f�r die Erstellung angegeben"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei f�r die Erstellung angegeben"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "Es wurden keine Pakete f�r die Installation angegeben"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete f�r die Installation angegeben"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente f�r die Anfrage angegeben"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente f�r die �berpr�fung angegeben"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "Es wurden keine Argumente f�r die Anfrage angegeben"
@@ -1206,12 +1206,12 @@ msgstr ""
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Paket-Architektur nicht �berpr�fen"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket %s wird nicht in %s aufgef�hrt"
@@ -1402,21 +1402,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "ung�ltige Paket-Nummer: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "ung�ltige Paket-Nummer: %s\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, fuzzy, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "ung�ltige Paket-Nummer: %s\n"
 
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "Fehler: kann %s nicht �ffnen\n"
+
+#: build/spec.c:714
+#, fuzzy, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "Anfrage von %s fehlgeschlagen\n"
+
 #: lib/cpio.c:207
 #, fuzzy, c-format
 msgid "(error 0x%x)"
@@ -2400,147 +2410,137 @@ msgstr "�ffnen von %s fehlgeschlagen: %s"
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "Fehler beim Format %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(beinhaltet keine Dateien)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 #, fuzzy
 msgid "not installed "
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(unbekannter Typ)"
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "Paket hat keinen Namen"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "Paket hat keinen Namen"
 
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "Fehler: kann %s nicht �ffnen\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "kein Paket triggert %s\n"
 
-#: lib/query.c:671
-#, fuzzy, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "Anfrage von %s fehlgeschlagen\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "kein Paket triggert %s\n"
 
 # , c-format
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "kein Paket triggert %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "kein Paket verlangt %s\n"
 
 # oder besser: ... listet %s auf? -ke-
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "kein Paket stellt %s bereit\n"
 
 # , c-format
-#: lib/query.c:875
+#: lib/query.c:709
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ung�ltige Paket-Nummer: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ung�ltige Paket-Nummer: %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
diff --git a/po/fi.po b/po/fi.po
index 7a1fa4aa9..143cba124 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
@@ -51,12 +51,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s ei vaikuta RPM-paketilta\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:334
+#: build.c:339
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "virhe etsitt�ess� pakettia %s\n"
@@ -124,115 +124,115 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "T�t� ohjelmaa voi vapaasti levitt�� GNU GPL:n puittessa"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "vain yksi p��moodi voidaan m��ritell�"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "odottamaton kyselyn l�hde"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 #, fuzzy
 msgid "unexpected query format"
 msgstr "odottamaton kyselyn l�hde"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "odottamaton kyselyn l�hde"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "vain asennus tai p�ivitys voidaan pakottaa"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "tiedostoja voidaan siirt�� toiselle polulle vain asennettaessa"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate: voidaan k�ytt�� vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix: voidaan k�ytt�� vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix parametrien pit�� alkaa /-merkill�"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h): voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches: voidaan k�ytt�� vain paketteja poistettaessa"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles: voidaan k�ytt�� vain paketteja asennettaessa"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan k�ytt�� vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -240,7 +240,7 @@ msgid ""
 msgstr ""
 "--justdb: voidaan k�ytt�� vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -248,7 +248,7 @@ msgid ""
 msgstr ""
 "--justdb: voidaan k�ytt�� vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -257,7 +257,7 @@ msgstr ""
 "--nodeps: voidaan k�ytt�� vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -265,7 +265,7 @@ msgstr ""
 "--test: voidaan k�ytt�� vain paketteja asennettaessa, poistettaessa ja "
 "k��nnett�ess�"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -273,80 +273,80 @@ msgstr ""
 "--root (-r): voidaan k�ytt�� vain paketteja asennettaessa, poistettaessa, "
 "kyselt�ess� ja tietokannan uudelleenluonnissa"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametrit --root (-r):lle alettava /-merkill�"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Tiedostoa ei l�ytynyt palvelimelta"
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign: voidaan k�ytt�� vain paketteja k��nnett�ess�"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "uudelleenk��nnolle ei m��ritelty paketteja"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "k��nn�kselle ei annettu m��rittelytiedostoja"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "k��nn�kselle ei m��ritelty tar-tiedostoja"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "asennukselle ei m��ritelty paketteja"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "asennukselle ei m��ritelty paketteja"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrej�"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrej�"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "kyselylle ei annettu parametrej�"
@@ -1106,12 +1106,12 @@ msgstr ""
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "�l� tarkista paketin arkkitehtuuria"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "paketti %s ei ole %s:ss�"
@@ -1299,21 +1299,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, fuzzy, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "virhe: en voi avata %s\n"
+
+#: build/spec.c:714
+#, fuzzy, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "%s:n kysely ei onnistunut\n"
+
 #: lib/cpio.c:207
 #, fuzzy, c-format
 msgid "(error 0x%x)"
@@ -2283,144 +2293,134 @@ msgstr "en voinut avata %s: %s"
 msgid "%s failed: %s\n"
 msgstr "pgp ep�onnistui"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "virhe formaatissa: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(ei tiedostoja)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 #, fuzzy
 msgid "not installed "
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(tuntematon tyyppi)"
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "paketilla ei ole nime�"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paketilla ei ole nime�"
 
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "virhe: en voi avata %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "vanhan formaatin l�hdekoodipaketteja ei voi kysell�\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "mik��n paketti ei laukaise %s:a\n"
 
-#: lib/query.c:671
-#, fuzzy, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "%s:n kysely ei onnistunut\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ryhm�ss� %s ei ole paketteja\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "mik��n paketti ei laukaise %s:a\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "mik��n paketti ei laukaise %s:a\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "mik��n pakettie ei tarvitse %s:a\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "mik��n paketti ei tarjoa %s:a\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
diff --git a/po/fr.po b/po/fr.po
index 82431643b..65ef3836d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,12 +56,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:334
+#: build.c:339
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -128,132 +128,132 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Peut tre redistribu librement selon les termes de la GNU GPL"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "un seul mode majeur peut tre spcifi"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "un seul type de requte/vrification peut tre effectu  la fois"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "source de requte inattendue"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 #, fuzzy
 msgid "unexpected query format"
 msgstr "source de requte inattendue"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "source de requte inattendue"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "seules l'installation et la mise  jour peuvent tre forces"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr ""
 "--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--clean ne peut tre spcifi que lors de la construction d'un package"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 #, fuzzy
 msgid "--prefix may only be used when installing new packages"
 msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 #, fuzzy
 msgid "arguments to --prefix must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 #, fuzzy
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 #, fuzzy
 msgid "--includedocs may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 #, fuzzy
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "un seul mode majeur peut tre spcifi"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 #, fuzzy
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 #, fuzzy
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 #, fuzzy
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--replacepkgs ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -262,7 +262,7 @@ msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -271,7 +271,7 @@ msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -280,7 +280,7 @@ msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 #, fuzzy
 msgid ""
 "--test may only be specified during package installation, erasure, and "
@@ -289,7 +289,7 @@ msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 #, fuzzy
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
@@ -298,81 +298,81 @@ msgstr ""
 "--root (-r) ne peut tre spcifi que lors de l'installation, de la "
 "dsinstallation ou de l'interrogation d'un package"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 #, fuzzy
 msgid "pgp not found: "
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "La vrification du mot de passe a chou\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Mot de passe correct.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 #, fuzzy
 msgid "exec failed\n"
 msgstr "La construction a chou.\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "aucun package n'a t spcifi pour la reconstruction"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "aucun package n'a t spcifi pour la construction"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 #, fuzzy
 msgid "no tar files given for build"
 msgstr "aucun package n'a t spcifi pour la construction"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "aucun argument n'a t fourni pour la requte"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "aucun argument n'a t fourni pour la vrification"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "aucun argument n'a t fourni pour la requte"
@@ -1127,12 +1127,12 @@ msgstr ""
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "%s ne peut tre construit sur cette architecture\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
@@ -1329,21 +1329,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr ""
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2322,144 +2332,134 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 #, fuzzy
 msgid "not installed "
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr ""
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
diff --git a/po/gl.po b/po/gl.po
index 70bd2f17c..1c37a09b7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -50,12 +50,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
@@ -121,209 +121,209 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr ""
 
@@ -1072,11 +1072,11 @@ msgstr ""
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1244,21 +1244,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr ""
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr ""
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr ""
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2153,140 +2163,130 @@ msgstr ""
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:278
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr ""
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr ""
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr ""
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 6cc57e013..2c18b3167 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -51,12 +51,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "Skr�in %s vir�ist ekki vera specskr�.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "���i fyrir markkerfi: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "���i fyrir markkerfi %s\n"
@@ -124,209 +124,209 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "�essu m� dreifa frj�lst samkv�mt skilm�lum GNU GPL"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr ""
 
@@ -1079,11 +1079,11 @@ msgstr ""
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1255,21 +1255,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr ""
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr ""
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr ""
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2180,140 +2190,130 @@ msgstr "gat ekki opna� %s: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s br�st\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:278
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr ""
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "get ekki opna� pakka gagnagrunn �\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr ""
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Get ekki lesi� %s: %s.\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "get ekki opna� pakka gagnagrunn �\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 16fdd4be0..eaeb52d9b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -56,12 +56,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "�ե����� %s �� ���ڥå��ե�����ǤϤʤ��褦�Ǥ���\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "�����楿�����åȥץ�åȥե�����: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "�������å� %s �Ѥ˺�����\n"
@@ -135,49 +135,49 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "GNU���̸�ͭ���ѵ�����β��Ǽ�ͳ�����ۤǤ��ޤ�"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, fuzzy, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "��������(%d)�Ǥ��������顼 :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "��ĤΥ᥸�㡼�⡼�ɤΤߤ���ꤷ�Ƥ�������"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "�䤤��碌/���ڤϰ��٤˰�Ĥ����¹ԤǤ��ޤ���"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "ͽ�������䤤��碌�Υե饰"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 #, fuzzy
 msgid "unexpected query format"
 msgstr "ͽ�������䤤��碌�Υե����ޥå�"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "ͽ�������䤤��碌�Υ�����"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "���󥹥ȡ��롢���åץ��졼�ɡ���������������ڥå��ե����������Τ߶����Ǥ�"
 "�ޤ�"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "�ե�����ϥѥå��������󥹥ȡ�����Τߺ����֤Ǥ��ޤ�"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
@@ -185,82 +185,82 @@ msgstr ""
 "--relocate �� --excludepath �Ͽ������ѥå������򥤥󥹥ȡ��뤹��Ȥ��Τ߻���"
 "�Ǥ��ޤ�"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix �Ͽ����˥ѥå������򥤥󥹥ȡ��뤹��Ȥ��Τ߻��ѤǤ��ޤ�"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix �ؤΰ����� / ����Ϥޤ�ͤФʤ�ޤ���"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs �� --includedocs �Ϥɤ��餫�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "-ignoreos �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "-ignoresize �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches �ϥѥå������κ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles �ϥѥå������Υ��󥹥ȡ�����Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb �ϥѥå������Υ��󥹥ȡ��롢������Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb �ϥѥå������Υ��󥹥ȡ��롢������Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb �ϥѥå������Υ��󥹥ȡ��롢������Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -268,13 +268,13 @@ msgid ""
 msgstr ""
 "--nodeps �ϥѥå������κ��������󥹥ȡ��롢��������ڻ��Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test �ϥѥå������Υ��󥹥ȡ��롢������������Τ߻���Ǥ��ޤ�"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -282,79 +282,79 @@ msgstr ""
 "--root (-r) �ϥ��󥹥ȡ��롢������䤤��碌���ǡ����١����ƹ��ۻ��Τ߻����"
 "���ޤ�"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) �ΰ����� / ����Ϥޤ�ͤФʤ�ޤ���"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "��̾���뤿��Υե����뤬����ޤ���\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "�ե����� %s �˥��������Ǥ��ޤ���\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 #, fuzzy
 msgid "pgp not found: "
 msgstr "pgp �����Ĥ���ޤ���: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ�������: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "�ѥ��ե졼�������å��˼��Ԥ��ޤ���\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "�ѥ��ե졼��������Ǥ���\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "�ޥ����ե��������̵���� %%_signature ��\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign �ϥѥå������������Τ߻��ѤǤ��ޤ�"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "�¹Լ���\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "�ƺ������뤿��Υѥå������ե����뤬����ޤ���"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "�����Τ���� spec �ե����뤬����ޤ���"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "����(build)�Τ���� tar �ե����뤬����ޤ���"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "���󥹥ȡ���Τ���Υѥå�����������ޤ���"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "���󥹥ȡ���Τ���Υѥå�����������ޤ���"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "�䤤��碌�Τ���ΰ���������ޤ���"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "���ڤΤ���ΰ���������ޤ���"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "�䤤��碌�Τ���ΰ���������ޤ���"
@@ -1125,12 +1125,12 @@ msgstr "%s:%d: if ���ʤ��Τ� %%endif ������ޤ�"
 msgid "malformed %%include statement\n"
 msgstr "�������� %%include ���ơ��ȥ��ȤǤ�"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "����(build)��ǽ�ʥ������ƥ�����Ϥ���ޤ���"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "�ѥå������ˤ� %%description ������ޤ���: %s"
@@ -1320,21 +1320,31 @@ msgstr "�������åȥץ�åȥե�������񤭤��ޤ�"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "���ڥå��ե����륫��������� I18N ʸ�����õ���Ƥ��ޤ�"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "%d ����: �������ֹ�: %s"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "%d ����: ������ no%s �ֹ�: %d"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "%d ����: ������ %s �ֹ�: %s\n"
 
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "%s ����(unlink)�Ǥ��ޤ���: %s\n"
+
+#: build/spec.c:714
+#, fuzzy, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "���ڥå��ե����� %s �ؤ��䤤��碌�˼��Ԥ��ޤ������ѡ����Ǥ��ޤ���\n"
+
 #: lib/cpio.c:207
 #, fuzzy, c-format
 msgid "(error 0x%x)"
@@ -2320,143 +2330,133 @@ msgstr "%s �Υ����ץ�˼���: %s"
 msgid "%s failed: %s\n"
 msgstr "%s ����"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "�ե����ޥå���Υ��顼: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "�ե������ޤ�Ǥ��ޤ���"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "�̾�"
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "�֤��������Ƥ��ޤ�"
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "���󥹥ȡ��뤵��Ƥ��ޤ���"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "�ͥåȶ�ͭ"
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(���ξ��֤⤢��ޤ���)"
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(̤�Τ� %3d)"
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "�ѥå������ϥե������ͭ�Ԥ� id �ꥹ�Ȥ�ɤ������äƤ��ޤ���"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "�ѥå������ϥե������ͭ�Ԥ� id �ꥹ�Ȥ�ɤ������äƤ��ޤ���"
 
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "%s ����(unlink)�Ǥ��ޤ���: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s �ؤ��䤤��碌�˼��Ԥ��ޤ���\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "������Υ������ѥå��������䤤��碌�뤳�ȤϤǤ��ޤ���\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s ��ȥꥬ������ѥå�������¸�ߤ��ޤ���\n"
 
-#: lib/query.c:671
-#, fuzzy, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "���ڥå��ե����� %s �ؤ��䤤��碌�˼��Ԥ��ޤ������ѡ����Ǥ��ޤ���\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "%d �ĤΥѥå������򸫤Ĥ��ޤ���\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "���롼�� %s ��°����ѥå�������¸�ߤ��ޤ���\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s ��ȥꥬ������ѥå�������¸�ߤ��ޤ���\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s ���ɤ�Τ˼���: $s��"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s ��ȥꥬ������ѥå�������¸�ߤ��ޤ���\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s ��ɬ�פȤ���ѥå�������¸�ߤ��ޤ���\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s ���󶡤���ѥå�������¸�ߤ��ޤ���\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "�ե����� %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "�ե����� %s �ϤɤΥѥå������ˤ�°���Ƥ��ޤ���\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "̵���ʥѥå������ֹ�: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "�ѥå������쥳�����ֹ� %d\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "�쥳���� %d ���ɤळ�Ȥ��Ǥ��ޤ���Ǥ���\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "�ѥå����� %s �ϥ��󥹥ȡ��뤵��Ƥ��ޤ���\n"
diff --git a/po/ko.po b/po/ko.po
index cba24c3ee..31968e638 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -51,12 +51,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s ������ spec ������ �ƴ� �� �����ϴ�.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "��ǥ���(target) �÷������� ���� ��: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "%s(��)�� �����ϰ� �ֽ��ϴ�\n"
@@ -125,123 +125,123 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "�� ���α׷��� GNU Public License ������ �����Ӱ� ������� �� �ֽ��ϴ�"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "�μ� ó������ (%d) ���� ���� ������ �߻��߽��ϴ� :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "�ϳ��� ��(major) ��常 ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "����/���� ������ ���� �ٸ� ������ ���ÿ� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "�������� ���� �÷��� �Դϴ�"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "�������� ���� ���� �Դϴ�"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "�������� ���� �ҽ� �Դϴ�"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "��ġ, ���׷��̵�, �ҽ� ����, spec ���� �����ÿ��� ����˴ϴ�"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "��Ű�� ��ġ�ÿ��� ������ ���ġ�� �� �ֽ��ϴ�"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate �� --excludepath �ɼ��� �ֽ��� ��Ű���� ��ġ�� ������ ����� �� ��"
 "���ϴ�"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix �ɼ��� �ֽ��� ��Ű���� ��ġ�� ������ ����� �� �ֽ��ϴ�"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix �ɼ��� �μ��� �ݵ�� '/' �� �����ؾ� �մϴ�"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs �� --includedocs �ɼǸ� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches �ɼ��� ��Ű�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "��ũ��Ʈ ���� �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "Ʈ���� ���� �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -249,13 +249,13 @@ msgstr ""
 "--nodeps �ɼ��� ��Ű�� ����, ������(rebuild), ��������(recompile), ��ġ, ��"
 "��, �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test �ɼ��� ��Ű�� ��ġ, ����, ���۽ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -263,77 +263,77 @@ msgstr ""
 "--root (-r) �ɼ��� ��Ű�� ��ġ, ����, ����, �����ͺ��̽� �籸��ÿ��� ������ "
 "�� �ֽ��ϴ�"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) �ɼ��� �μ��� �ݵ�� '/' �� �����ؾ� �մϴ�"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "������ ������ �����ϴ�\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "%s ���Ͽ� ������ �� �����ϴ�\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp�� ã�� �� ����: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "�н� ����(pass phrase) �Է�: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "�н� ����(pass phrase)�� �ùٸ��� �ʽ��ϴ�\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "�н� ����(pass phrase)�� ��ġ�մϴ�.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "��ũ�� ���Ͽ� �������� %%_signature�� ������ �ֽ��ϴ�.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign �ɼ��� ��Ű�� ���۽ÿ��� ����� �� �ֽ��ϴ�"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "���࿡ �����߽��ϴ�\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "������(rebuild)�� ��Ű�� ������ �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "��Ű�� ���ۿ� �ʿ��� spec ������ �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "��Ű�� ���ۿ� �ʿ��� tar ������ �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 msgid "no packages given for erase"
 msgstr "������ ��Ű���� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "��ġ�� ��Ű���� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "���ǿ� �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "������ �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "���ǿ� �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
@@ -1088,11 +1088,11 @@ msgstr "%s:%d: %%endif�� %%if ���� ���Ǿ����ϴ�\n"
 msgid "malformed %%include statement\n"
 msgstr "%%include ���� �ùٸ��� �ʽ��ϴ�\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr "��Ű�� ���ۿ� ȣȯ�ϴ� ��Ű���ĸ� ã�� �� �����ϴ�\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "��Ű���� %%description�� ����: %s\n"
@@ -1264,21 +1264,32 @@ msgstr "��ǥ���(target) �÷����� ��ü(override)�մϴ�"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "spec���� ���(catalog)���� i18N ���ڿ��� �˻��մϴ�"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "%d ��° ��: �߸��� �����Դϴ�: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "%d ��° ��: no%s(��)�� �߸��� �����Դϴ�: %d\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "%d ��° ��: %s(��)�� �߸��� �����Դϴ�: %s\n"
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr "%s(��)�� ������ �� ����: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr ""
+"%s spec ������ �����ϴµ� �����߽��ϴ�, ������ ó��(parse)�� �� �����ϴ�\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2216,142 +2227,131 @@ msgstr "%2$s ������ %1$s(��)�� ������: %3$s\n"
 msgid "%s failed: %s\n"
 msgstr "%s(��)�� ������: %s\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "�ùٸ��� ���� ����: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(������ ���ԵǾ� ���� ����)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "����(normal)        "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "��ü��(replaced)    "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "��ġ�Ǿ� ���� ����  "
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "net ������          "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(���¸� �� �� ����) "
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(�� �� ���� %3d)    "
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "��Ű���� ���� ������ �Ǵ� id ����� �����ϴ�\n"
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr "��Ű���� ���� ������ �Ǵ� id ����� �����ϴ�\n"
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr "%s(��)�� ������ �� ����: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s(��)�� ���µ� ������: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s(��)�� �����ϴµ� �����߽��ϴ�\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "���� ������ �ҽ� ��Ű���� ������ �� �����ϴ�\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s(��)�� ��ġ�ϴ� ��Ű���� ����: %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr ""
-"%s spec ������ �����ϴµ� �����߽��ϴ�, ������ ó��(parse)�� �� �����ϴ�\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr "��Ű���� �����ϴ�\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s �׷��� � ��Ű������ ���ԵǾ� ���� �ʽ��ϴ�\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s(��)�� �����ϴ�(trigger) ��Ű���� �����ϴ�\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s(��)�� �߸���: %s\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s(��)�� ��ġ�ϴ� ��Ű���� ����: %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s(��)�� �ʿ�� �ϴ� ��Ű���� �����ϴ�\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s(��)�� �����ϴ� ��Ű���� �����ϴ�\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "%s ����: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s ������ � ��Ű������ ������� �ʽ��ϴ�\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "�������� ��Ű�� ��ȣ: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr "��Ű�� ���(record) ��ȣ: %u\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "���(record) ��ȣ %u(��)�� ���� �� �����ϴ�\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ��Ű���� ��ġ�Ǿ� ���� �ʽ��ϴ�\n"
diff --git a/po/no.po b/po/no.po
index 95cee929f..441697c8b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -51,12 +51,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "Fil %s ser ikke ut til � v�re en spec-fil.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger m�lplattformene: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger for m�l %s\n"
@@ -125,110 +125,110 @@ msgid ""
 msgstr ""
 "Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "kun ett st�rre modi kan spesifiseres"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "�n type sp�rring/verifisering kan utf�res om gangen"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "uventede flagg for sp�rring"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "ventet sp�rringsformat"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "uventet sp�rringskilde"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omplasseres under pakkeinstallasjon"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenter til --prefix m� begynne med en /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -236,7 +236,7 @@ msgstr ""
 "skript som sl�r av alternativer kan kun spesifiseres under pakkeinstallasjon "
 "og sletting"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -244,96 +244,96 @@ msgstr ""
 "alternativer som sl�r av utl�sing  kan kun spesifiseres under "
 "pakkeinstallasjon, og sletting"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "ingen filer � signere\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan ikke aksessere fil %s\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp ikke funnet: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "Skriv inn passord: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Passordsjekk feilet\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Passord er ok.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "kj�ring feilet\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler oppgitt for ombygging"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "ingen spec-fil oppgitt for bygging"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "ingen tar-fil oppgitt for bygging"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "ingen argumenter oppgitt for sp�rring"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "ingen argumenter oppgitt for verifisering"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for sp�rring"
@@ -1092,11 +1092,11 @@ msgstr "%s:%d: %%endif uten %%if\n"
 msgid "malformed %%include statement\n"
 msgstr "ugyldig %%include utsagn\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen kompatible arkitekturer funnet for bygging\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakken har ingen %%description: %s\n"
@@ -1270,21 +1270,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "linje %d: Ugyldig nummer: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "linje %d: Ugyldig no%s nummer: %d\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linje %d: Ugyldig %s-nummer: %s\n"
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr "kan ikke sp�rre p� %s: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr ""
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2206,141 +2216,131 @@ msgstr "klarte ikke � �pne %s: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ukorrekt format: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(inneholder ingen filer)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "erstattet     "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "ikke installert"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "delt via nett "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(ingen tilstand)"
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ukjent %3d)  "
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "pakken har verken fileier eller id-lister\n"
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr "pakken har verken fileier eller id-lister\n"
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr "kan ikke sp�rre p� %s: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under �pning av %s: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "sp�rring p� %s feilet\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "kildepakker i gammelt format kan ikke sp�rres\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "ingen pakke utl�ser %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr ""
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s inneholder ingen pakker\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakke utl�ser %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "ingen pakke utl�ser %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakke krever %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakke gir %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s eies ikke av noen pakke\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
diff --git a/po/pl.po b/po/pl.po
index 6f4fb5ee9..1d160d2b3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe� Dzieko�ski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -58,12 +58,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s nie wygl�da na pakiet RPM\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Budowanie dla platform: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
@@ -132,125 +132,125 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Program mo�e by� swobodnie rozpowszechniany na warunkach licencji GNU"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "B��d wewn�trzny w przetwarzaniu argumentu (%d) :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "tylko jeden g��wny tryb pracy mo�e by� podany"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "tylko jeden typ odpytywania/sprawdzania mo�na wykona� na raz"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "b��dna konstrukcja argument�w odpytywania"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "b��dna konstrukcja argument�w odpytywania"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "b��dna konstrukcja argument�w odpytywania"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "tylko instalacj�, uaktualnienie i usuwanie �r�de� mo�na wymusi�"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "przesuwania plik�w mo�na dokona� tylko w trakcie instalacji"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate i --excludepath mo�na u�y� tylko w trakcie instalacji nowych "
 "pakiet�w"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mo�na u�y� tylko w trakcie instalacji nowych pakiet�w"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty dla --prefix musz� si� rozpoczyna� od /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "nie mo�na jednocze�nie u�y� --excludedocs i --includedocs"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mo�na u�y� tylko w trakcie usuwania pakiet�w"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mo�na u�y� tylko w trakcie instalacji pakiet�w"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mo�na u�y� tylko w trakcie instalacji lub usuwania pakiet�w"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb mo�na u�y� tylko w trakcie instalacji lub usuwania pakiet�w"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb mo�na u�y� tylko w trakcie instalacji lub usuwania pakiet�w"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -259,14 +259,14 @@ msgstr ""
 "--nodeps mo�na u�y� tylko w trakcie budowania, instalacji, usuwania lub "
 "sprawdzania pakiet�w"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test mo�na u�y� tylko w trakcie instalacji, usuwania lub budowania pakiet�w"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -274,78 +274,78 @@ msgstr ""
 "--root (-r) mo�na u�y� tylko w trakcie instalacji, usuwania, sprawdzania "
 "pakiet�w lub przebudowywania bazy"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty dla --root (-r) musz� si� rozpoczyna� od /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "brak dost�pu do pliku %s\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "nie znaleziono pgp: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "Podaj has�o: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Weryfikacja has�a nieudana\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Has�o jest prawid�owe.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "B��dny %%_signature spec w pliku makra.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign mo�na u�y� tylko w trakcie budowania pakietu"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "wykonanie nie powiod�o si�\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakiet�w do przebudowania"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "nie podano nazw plik�w spec do budowania"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "nie podano nazw plik�w tar do budowania"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nie podano nazw plik�w do zainstalowania"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "nie podano nazw plik�w do zainstalowania"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "nie podano argument�w dla trybu zapyta�"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "nie podano argument�w dla sprawdzania"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "nie podano argument�w dla trybu zapyta�"
@@ -1116,12 +1116,12 @@ msgstr "%s:%d: Napotkano %%endif bez if"
 msgid "malformed %%include statement\n"
 msgstr "b�ednie sformatowany wpis %%include"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Nie mo�na budowa� na takie architektury"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakiet nie ma %%description: %s"
@@ -1306,21 +1306,31 @@ msgstr "wymu� platform� docelow�"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "wyszukaj wpisy I18N w katalogu speca"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "linia %d: B��dny numer: %s"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "linia %d: b��dny numer no%s: %d"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linia %d: B��dny numer %s: %s\n"
 
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "nie mo�na odwi�za� %s: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "odpytywanie pliku spec %s nie powiod�o si�, nie mo�na interpretowa�\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2284,143 +2294,133 @@ msgstr "nie mo�na otworzy� %s: %s"
 msgid "%s failed: %s\n"
 msgstr "%s nie powiod�o si�"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "b��d w formacie: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(nie zawiera plik�w)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "normalny      "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "zast�piony    "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "niezainstalowany"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "udost�pniony w sieci"
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(brak statusu)"
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(nieznany %3d)"
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "pakiet nie ma ani w�a�ciciela pliku ani list id"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "pakiet nie ma ani w�a�ciciela pliku ani list id"
 
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "nie mo�na odwi�za� %s: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiod�o si�: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "odpytywanie %s nie powiod�o si�\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mog� by� odpytywane\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "�aden pakiet nie zahacza %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "odpytywanie pliku spec %s nie powiod�o si�, nie mo�na interpretowa�\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "znaleziono %d pakiet�w\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s nie zawiera �adnych pakiet�w\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "�aden pakiet nie zahacza %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Odczytanie %s nie powiod�o si�: %s."
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "�aden pakiet nie zahacza %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "�aden pakiet nie wymaga %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "�aden pakiet nie udost�pnia %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "b��dny numer pakietu: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "numer rekordu pakietu: %d\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "nie mo�na odczyta� rekordu %d\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
diff --git a/po/pt.po b/po/pt.po
index ba3966dae..eca802711 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: Jos� Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -51,12 +51,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "O ficheiro %s n�o parece ser um ficheiro spec.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "A construir plataformas alvo: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "A construir para o alvo %s\n"
@@ -125,113 +125,113 @@ msgid ""
 msgstr ""
 "Este programa pode ser distribu�do livremente sob os termos da GPL da GNU"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "s� pode ser especificado um 'major mode'"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "s� pode ser realizado um tipo de pesquisa/verifica��o de cada vez"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "op��es de pesquisa inesperadas"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "formato de pesquisa inesperado"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "origem de pesquisa inesperada"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "s� a instala��o, a actualiza��o, o rmsource e o rmpspec podem ser for�ados"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr ""
 "os ficheiros s� podem ser mudados de s�tio durante a instala��o do pacote"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "o --relocate e o --excludepath s� podem ser usados ao instalar pacotes novos"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "o --prefix s� pode ser usado ao instalar pacotes novos"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "os argumentos do --prefix t�m de come�ar por /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "o --hash (-h) s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "o --percent s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "o --replacefiles s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "o --replacepkgs s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "o --excludedocs  s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "o --includedocs  s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "s� uma das op��es --excludedocs e --includedocs pode ser usada"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "o --ignorearch s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "o --ignoreos s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "o --ignoresize s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "o --allmatches s� pode ser indicado ao apagar o pacote"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "o --allfiles s� pode ser indicado durante a instala��o do pacote"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "o --justdb s� pode ser indicado durante a instala��o ou a remo��o do pacote"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -239,7 +239,7 @@ msgstr ""
 "a desactiva��o de 'scripts' s� pode ser indicado durante a instala��o ou a "
 "remo��o de pacotes"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -247,7 +247,7 @@ msgstr ""
 "a desactiva��o dos 'triggers' s� pode ser usado durante a instala��o ou "
 "remo��o de pacotes"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -255,7 +255,7 @@ msgstr ""
 "o --nodeps s� pode ser indicado durante a cria��o, reconstru��o, "
 "recompila��o, instala��o, remo��o ou verifica��o do pacote"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -263,7 +263,7 @@ msgstr ""
 "o --test s� pode ser indicado durante a instala��o, remo��o ou cria��o do "
 "pacote"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -271,77 +271,77 @@ msgstr ""
 "o --root (-r) s� pode ser indicado durante a instala��o, remo��o ou pesquisa "
 "do pacote ou na reconstru��o da base de dados"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "os argumentos do --root (-r) t�m de come�ar por /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "n�o existem ficheiros a assinar\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "n�o consigo aceder ao ficheiro %s\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp n�o encontrado: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "Indique a palavra-chave: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "A verifica��o da palavra-chave falhou\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "A palavra-chave est� correcta.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Spec %%_signature inv�lido no ficheiro de macros.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "o --sign s� pode ser usado na cria��o do pacote"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "o exec falhou\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "n�o foram indicados pacotes para a reconstru��o"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "n�o foram indicados ficheiros spec para a cria��o"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "n�o foram indicados ficheiros tar para a cria��o"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 msgid "no packages given for erase"
 msgstr "n�o foram indicados pacotes para apagar"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "n�o foram indicados pacotes para instalar"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "n�o foram indicados argumentos para a pesquisa"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "n�o foram indicados argumentos para a verifica��o"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "n�o foram indicados argumentos para a pesquisa"
@@ -1098,11 +1098,11 @@ msgstr "%s:%d: Descobri um %%endif sem um %%if\n"
 msgid "malformed %%include statement\n"
 msgstr "instru��o %%include desorganizada\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr "N�o foram encontradas arquitecturas compat�veis para as quais criar\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote n�o tem uma %%description: %s\n"
@@ -1280,21 +1280,31 @@ msgstr "ignorar a plataforma-alvo"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "procurar as mensagens de i18N no cat�logo do ficheiro spec"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "linha %d: N�mero inv�lido: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "linha %d: N�mero no%s inv�lido: %d\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linha %d: N�mero %s inv�lido: %s\n"
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr "n�o consigo pesquisar o %s: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "a pesquisa do ficheiro spec %s falhou, n�o consigo analisar\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2228,142 +2238,132 @@ msgstr "%s falhou no ficheiro %s: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s falhou: %s\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "formato incorrecto: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(n�o cont�m ficheiros)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "substitu�do   "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "n�o instalado "
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "partilhado"
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(sem estado)  "
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(desconhecido %3d)"
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr "n�o consigo pesquisar o %s: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "a pesquisa do %s falhou\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 "os pacotes com c�digo-fonte no formato antigo n�o podem ser pesquisados\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "nenhum pacote coincide com %s: %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "a pesquisa do ficheiro spec %s falhou, n�o consigo analisar\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr "nenhum pacote\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "o grupo %s n�o cont�m nenhum pacote\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nenhum pacote activa o %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "malformado %s: %s\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "nenhum pacote coincide com %s: %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nenhum pacote precisa do %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nenhum pacote oferece o %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ficheiro %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "o ficheiro %s n�o pertence a nenhum pacote\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "n�mero de pacote inv�lido: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr "n�mero de registo do pacote: %u\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "o registo %u n�o p�de ser lido\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s n�o est� instalado\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2df875165..f1ff5803f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -56,12 +56,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:334
+#: build.c:339
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "instale pacote"
@@ -140,125 +140,125 @@ msgstr ""
 "Este Software pode ser livremente redistribuido sob os termos da Licensa "
 "Pblica GNU (GPL)"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "somente um modo principal pode ser especificado"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "um tipo de pesquisa/verificao pode ser feita por vez"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 #, fuzzy
 msgid "unexpected query format"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "somente instalao e atualizao podem ser foradas"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumentos para --prefix devem comear com uma /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) somente podem ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches somente pode ser especificado durante desinstalaes de pacotes"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -267,7 +267,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -276,7 +276,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -285,7 +285,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalaes e verificaes "
 "de pacotes"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -293,7 +293,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -301,80 +301,80 @@ msgstr ""
 "--root (-r) somente pode ser especificado durante [des]instalaes, pesquisas "
 "e reconstruo de bancos de dados"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumentos para --root (-r) devem comear com uma /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 #, fuzzy
 msgid "pgp not found: "
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Checagem de pass phrase falhou\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Pass phrase ok.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign somente pode ser usado durante a construo de pacotes"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 #, fuzzy
 msgid "exec failed\n"
 msgstr "Construo falhou.\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "no foram passados pacotes para reconstruo"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "no foi passado arquivo spec para construo"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "no foram passados arquivos tar para construo"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "no foi passado argumento para pesquisa"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "no foi passado argumento para verificao"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "no foi passado argumento para pesquisa"
@@ -1218,12 +1218,12 @@ msgid "malformed %%include statement\n"
 msgstr ""
 
 # , c-format
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "%s no pode ser construido nesta arquitetura\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "no foi passado pacote para desinstalao"
@@ -1414,22 +1414,33 @@ msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 # , c-format
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
+# , c-format
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "No consegui abrir: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr ""
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2410,146 +2421,135 @@ msgstr "No consegui abrir: %s\n"
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 #, fuzzy
 msgid "not installed "
 msgstr "no foi passado pacote para instalao"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "no foi passado pacote para instalao"
 
-# , c-format
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "No consegui abrir: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr ""
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
 # , c-format
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
diff --git a/po/ro.po b/po/ro.po
index c0306e58a..a81917041 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -50,12 +50,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
@@ -121,209 +121,209 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr ""
 
@@ -1072,11 +1072,11 @@ msgstr ""
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1244,21 +1244,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr ""
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr ""
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr ""
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2153,140 +2163,130 @@ msgstr ""
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:278
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr ""
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr ""
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr ""
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 4f89ad24a..fd039abf1 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,12 +56,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
@@ -127,209 +127,209 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr ""
 
@@ -1078,11 +1078,11 @@ msgstr ""
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1250,21 +1250,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr ""
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr ""
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr ""
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2159,140 +2169,130 @@ msgstr ""
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:278
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr ""
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr ""
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr ""
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 30afe14cc..6add0c7ee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -52,12 +52,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "���� %s �� ����� �� ���� ������������.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "��������� ��� ������: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "������ ��� ��������� %s\n"
@@ -124,115 +124,115 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "��� ��������� ����� �������� �������������� �� �������� GNU GPL\n"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "���������� ������ ��� ��������� ���������� (%d) :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "����� ���� ������ ������ ���� �� �������� �������"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "�� ���� ��� ����� ���� �������� ������ ���� ��� �������� ��� �������"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "����������� ����� �������"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "����������� ������ �������"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "����������� �������� �������"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "��������������� ����� ���� ������ ���������, ����������, �������� ���������� "
 "� ����� ������������"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "����� ����� ���� ���������� ������ ��� ��������� ������"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "�������� --relocate � --excludepath ����� ������������ ������ ��� ��������� "
 "����� �������"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "������� --prefix ����� ������������ ������ ��� ��������� ����� �������"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "��������� ��� --prefix ������ ���������� � /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "����� ���� ����������� ������ ���� �� ���������� --excludedocs ��� --"
 "includedocs"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ����� ���� ������ ������ ��� �������� ������"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ����� ���� ������ ������ ��� ��������� ��� �������� ������"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -240,7 +240,7 @@ msgstr ""
 "��������� ������� ��������� ����� ���� ������� ������ ��� ��������� ��� "
 "�������� ������"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -248,7 +248,7 @@ msgstr ""
 "��������� ������� ��������� ����� ���� ������ ������ ��� ��������� ��� "
 "�������� ������(��)"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -256,14 +256,14 @@ msgstr ""
 "--nodeps ����� ���� ������ ������ ��� ������, ���������, �������� � �������� "
 "�������"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test ����� ���� ������ ������ ��� ���������, �������� � ������ ������"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -271,77 +271,77 @@ msgstr ""
 "--root (-r) ����� ���� ������� ������ ��� ���������, ��������, �������� "
 "������ � ������������ ���� ������"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "��������� ��� --root (-r) ������ ���������� � /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "��� ������ ��� �������\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "��� ������� � ����� %s\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp �� ������: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "������� �������� �����: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "�������� �������� �����\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "�������� ����� �������.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "�������� ������������ %%_signature � ����������.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign ����� ���� ����������� ������ ��� ������ �������"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "������ �� ������\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "�� ������ ������ ��� ����������"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "�� ����� ���� ������������ ��� ������ ������"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "�� ������ tar-����� ��� ������ ������"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 msgid "no packages given for erase"
 msgstr "�� ������ ������ ��� ��������"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "�� ������ ������ ��� ���������"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "�� ������ ��������� �������"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "�� ������ ��������� ��� �����������"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr "�� ������ ���������"
 
@@ -1097,11 +1097,11 @@ msgstr "%s:%d: ������ %%endif ��� %%if\n"
 msgid "malformed %%include statement\n"
 msgstr "�������� ���������� %%include\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr "�� ������� ����������� ����������� ��� ������.\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "����� �� ����� %%description: %s\n"
@@ -1280,21 +1280,31 @@ msgstr "�������������� ������� ���������"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "������ ������ I18N � �������� ����� ������������"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "������ %d: �������� �����: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "������ %d: �������� ����� no%s: %d\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "������ %d: �������� ����� %s: %s\n"
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr "���������� ��������� %s: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "������ ����� ������������ %s �� ������, ���������� ��������� ����\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2200,140 +2210,130 @@ msgstr "%s ������ �� ����� %s: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s �� �������: %s\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "������ � �������: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(�� �������� ������)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "����������    "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "����������    "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "�� ���������� "
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "�������       "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(����. ���)   "
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(�����. %3d)  "
 
-#: lib/query.c:279
+#: lib/query.c:278
 msgid "package has not file owner/group lists\n"
 msgstr "����� �� �������� ������� ����������/�����-���������� ������\n"
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr "����� �� �������� ������� �� ������ ������, �� �� ID\n"
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr "���������� ��������� %s: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "������ ������� %s\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "������� � �������� ������� � ������ ������� �� ��������������\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: �� ����� (��� �������� ������) rpm : %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "������ ����� ������������ %s �� ������, ���������� ��������� ����\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr "��� �������\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "������ %s �� �������� ������� �������\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "�� ���� �� ������� �� ������� ������� %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "������ ������� %s: %s.\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "�� ���� ����� �� �������� � %s: %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "�� ���� �� ������� �� ������� %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "�� ���� �� ������� �� ������������� %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "���� %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "���� %s �� ����������� �� ������ �� �������\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "�������� ����� ������: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr "����� ������ ������: %u\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "���������� ��������� ������ %u\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "����� %s �� ����������\n"
diff --git a/po/sk.po b/po/sk.po
index 52fd60dce..ebec99e7c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -51,12 +51,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s zrejme nie je RPM bal�k\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, fuzzy, c-format
 msgid "Building target platforms: %s\n"
 msgstr "predefinova� cie�ov� platformu"
 
-#: build.c:334
+#: build.c:339
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "vyh�ad�va sa bal�k %s\n"
@@ -125,128 +125,128 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Program m��e by� vo�ne redistribuovan� v s�lade s podmienkami GNU GPL"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Vn�torn� chyba pri spracovan� argumentu (%d) :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "m��e by� pou�it� iba jeden hlavn� re�im"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "naraz m��e by� vykonan� jeden typ ot�zky alebo overenia"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "iba in�tal�cia, aktualiz�cia a odstr�nenie zdrojov m��u by� vyn�ten�"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "s�bory m��u by� presunut� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate a --excludepath m��u by� pou�it� iba po�as in�tal�cie nov�ch "
 "bal�kov"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix m��e by� pou�it� iba po�as in�tal�cie nov�ch bal�kov"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pre --prefix musia za��na� znakom /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "m��e by� pou�it� iba jedna vo�ba z --excludedocs a --includedocs"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches m��e by� pou�it� iba po�as odstr�nenia bal�kov"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles m��e by� pou�it� iba po�as in�tal�cie bal�ka"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb m��e by� pou�it� iba po�as in�tal�cie a odstr�nenia bal�ka"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb m��e by� pou�it� iba po�as in�tal�cie a odstr�nenia bal�ka"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb m��e by� pou�it� iba po�as in�tal�cie a odstr�nenia bal�ka"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -255,7 +255,7 @@ msgstr ""
 "--nodeps m��e by� pou�it� iba po�as in�tal�cie, odstr�nenia alebo overenia "
 "bal�ka"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -263,7 +263,7 @@ msgstr ""
 "--test m��e by� pou�it� iba po�as in�tal�cie, odstr�nenia alebo zostavenia "
 "bal�ka"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -271,78 +271,78 @@ msgstr ""
 "--root (-r) m��e by� pou�it� iba po�as in�tal�cie a odstr�nenia bal�ka, "
 "ot�zky alebo znovuzostavenia datab�zy"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pre --root (-r) musia za��na� znakom /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "nie je mo�n� pracova� so s�borom %s\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp nebolo n�jden�: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Kontrola hesla zlyhala\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Heslo je v poriadku.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Chybn� �pecifik�cia %%_signature v makro-s�bore.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign m��e by� pou��t� iba po�as zostavenia bal�ka"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "neboli zadan� �iadne bal�ky pre znovuzostavenie"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "neboli zadan� �iadne spec-s�bory pre zostavenie"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "neboli zadan� �iadne tar-s�bory pre zostavenie"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "neboli zadan� �iadne bal�ky pre in�tal�ciu"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "neboli zadan� �iadne bal�ky pre in�tal�ciu"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "neboli zadan� �iadne argumenty pre ot�zku"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "neboli zadan� �iadne argumenty pre overenie"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "neboli zadan� �iadne argumenty pre ot�zku"
@@ -1112,12 +1112,12 @@ msgstr "%s:%d: %%endif bez if"
 msgid "malformed %%include statement\n"
 msgstr "znetvoren� pr�kaz %%include"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "�iadne zostavite�n� architekt�ry"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Bal�k neobsahuje %%description: %s"
@@ -1304,21 +1304,31 @@ msgstr "predefinova� cie�ov� platformu"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "pre preklad re�azcov pou�i� katal�g spr�v spec-s�borov"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "riadok %d: Chybn� ��slo: %s"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "riadok %d: Chybn� no%s ��slo: %d"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "riadok %d: Chybn� %s ��slo: %s\n"
 
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "zmazanie %s zlyhalo: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "ot�zka na spec-s�bor %s zlyhala, nie je mo�n� analyzova�\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2282,143 +2292,133 @@ msgstr "nepodarilo sa otvori� %s: %s"
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "chyba form�tu: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(neobsahuje �iadne s�bory)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "norm�lny      "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "nahraden�     "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "nein�talovan� "
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "zdie�an�      "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(�iadny stav) "
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(nezn�my %d)  "
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "bal�k neobsahuje ani vlastn�ka s�boru, ani zoznamy identifik�ci�"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "bal�k neobsahuje ani vlastn�ka s�boru, ani zoznamy identifik�ci�"
 
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "zmazanie %s zlyhalo: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "ot�zka na %s zlyhala\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "nie je mo�n� p�ta� sa zdrojov�ch bal�kov v starom form�te\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "�iadny z bal�kov nesp���a %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "ot�zka na spec-s�bor %s zlyhala, nie je mo�n� analyzova�\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "n�jden�ch %d bal�kov\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje �iadne bal�ky\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "�iadny z bal�kov nesp���a %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Nie je mo�n� pre��ta� %s: %s."
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "�iadny z bal�kov nesp���a %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "�iadny z bal�kov nevy�aduje %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "�iadny z bal�kov neposkytuje %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "s�bor %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "chybn� ��slo bal�ku: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "po�aduje sa z�znam ��slo %d\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "z�znam %d nie je mo�n� pre��ta�\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
diff --git a/po/sl.po b/po/sl.po
index 0913bc693..f8d881547 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.343 2002/12/21 20:38:11 jbj Exp $
+# $Id: sl.po,v 1.344 2002/12/22 02:11:19 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -56,12 +56,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "Ne ka�e, da je %s datoteka s specifikacijami."
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
@@ -130,124 +130,124 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Ta program je dovoljeno razpe�evati pod pogoji navedenimi v GNU GPL."
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "izbran sme biti le en glavni na�in"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo en tip poizvedbe/preverjanja je mo�en naenkrat"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "nepri�akovane zastavice pri poizvedbi"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "nepri�akovana oblika poizvedbe"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "nepri�akovan izvor poizvedbe"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix se sme uporabiti le pri namestitvi"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti izbire --prefix se morajo za�eti z /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "izbiri --excludedocs in --includedocs se medsebojno izklju�ujeta"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sme podan le ob namestitvi paketa"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sme biti podati le ob namestitvi paketa"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -255,14 +255,14 @@ msgstr ""
 "--nodeps sme biti podan le ob izgradnji, vnovi�ni izgradnji, prevajanju, "
 "namestitvi, odstranitvi ali preverjanju paketa"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -270,78 +270,78 @@ msgstr ""
 "--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
 "vnovi�ni izgradnji paketa"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti izbire --root (-r) se morajo za�eti z /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "ni datotek, ki bi jih lahko podpisal\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "dostop do datoteke %s ni mo�en\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp manjka: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "Vnesite pristopno geslo: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Preverjanje pristopnega gesla neuspe�no\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Pristopno geslo je pravo.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign sme biti podan le ob izgradnji paketa"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "izvajanje je bilo neuspe�no\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovi�no izgradnjo niso navedeni"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
@@ -1113,12 +1113,12 @@ msgstr "%s:%d: Najden je bil %%endif brez pripadajo�ega if"
 msgid "malformed %%include statement\n"
 msgstr "Deformiran stavek %%include"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Arhitektura za izgradnjo ni prisotna"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "V paketu manjka %%description: %s"
@@ -1306,21 +1306,31 @@ msgstr "brez upo�tevanja strojnega okolja ciljnega sistema"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "upo�tevanje internacionalizirana sporo�ila v katalogu spec"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "vrstica %d: Napa�no �tevilo: %s"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "vrstica %d: Napa�no �tevilo no%s: %d"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "vrstica %d: Napa�no �tevilo %s: %s\n"
 
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "ni mo�no poizvedeti o %s: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "poizvedba po datoteki spec. %s je bila neuspe�na, raz�lemba ni mo�na\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2282,143 +2292,133 @@ msgstr "neuspe�no odpiranje %s: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s neuspe�en"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "napaka v obliki: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(ne vsebuje datotek)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "normalno      "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "nadome��eno   "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "ni name��eno  "
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "omre�ni       "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(brez stanja) "
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznano %3d) "
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "ni mo�no poizvedeti o %s: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe�no: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "poizvedba po %s je bila neuspe�na\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni mo�na\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "noben paket ne pro�i %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "poizvedba po datoteki spec. %s je bila neuspe�na, raz�lemba ni mo�na\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "ni paketov\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s ne vsebuje nobenega paketa\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "noben paket ne pro�i %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Neuspe�no branje %s: %s."
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "noben paket ne pro�i %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "noben paket ne potrebuje %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "noben paket ne nudi %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ni del nobenega paketa\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neveljavna �tevilka paketa: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "�tevilka zapisa paketa: %d\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni mo�no prebrati\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name��en\n"
diff --git a/po/sr.po b/po/sr.po
index d2c35650a..8bd197e29 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,12 +49,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s ne li�i na RPM paket\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:334
+#: build.c:339
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "gre�ka potrage za paketom %s\n"
@@ -122,128 +122,128 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Mo�ete slobodno distribuirati dalje pod odredbama GNU GPL"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "samo jedan glavni re�im mo�e biti naveden"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo jedan tip upita/provere mo�e biti ura�en odjednom"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neo�ekivan izvor upita"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neo�ekivan izvor upita"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "neo�ekivan izvor upita"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "samo instalacija i a�uriranje mogu biti forsirane"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "datoteke mogu biti preme�tene samo tokom instalacije paketa"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate mo�ete koristiti samo kad instalirate novi paket"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mo�ete koristiti samo kod instalacije novog paketa"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti za --prefix moraju po�eti znakom /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "samo jedno mo�ete da navedete: --excludedocs ili --includedocs"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mo�ete koristiti samo kod brisanja paketa"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mo�ete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mo�ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb mo�ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb mo�ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -251,14 +251,14 @@ msgid ""
 msgstr ""
 "--nodeps mo�ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test mo�ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -266,80 +266,80 @@ msgstr ""
 "--root (-r) mo�ete navesti samo kod instalacije, uklanjanja, upita ili "
 "rekreiranja baze podataka"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti za --root (-r) moraju po�eti znakom /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datoteka nije prona�ena na serveru"
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Neuspela provera lozinke\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Lozinka je dobra.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign se mo�e koristiti samo kod kreiranja paketa"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "nedostaju argumenti za upit"
@@ -1099,12 +1099,12 @@ msgstr ""
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "paket %s nije naveden u %s"
@@ -1292,21 +1292,31 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, fuzzy, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, fuzzy, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
+#: build/spec.c:639
+#, fuzzy, c-format
+msgid "can't query %s: %s\n"
+msgstr "gre�ka: ne mogu da otvorim %s\n"
+
+#: build/spec.c:714
+#, fuzzy, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "upit nad %s neuspeo\n"
+
 #: lib/cpio.c:207
 #, fuzzy, c-format
 msgid "(error 0x%x)"
@@ -2274,144 +2284,134 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "gre�ka u formatu: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(nema datoteka)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:252
+#: lib/query.c:251
 #, fuzzy
 msgid "not installed "
 msgstr "paket %s nije instaliran\n"
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(nepoznat tip)"
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "paket nema imena"
 
-#: lib/query.c:312
+#: lib/query.c:311
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paket nema imena"
 
-#: lib/query.c:408
-#, fuzzy, c-format
-msgid "can't query %s: %s\n"
-msgstr "gre�ka: ne mogu da otvorim %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "Upit se ne mo�e izvesti nad izvorni paketima u starom formatu\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:671
-#, fuzzy, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "upit nad %s neuspeo\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 #, fuzzy
 msgid "no packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s ne sadr�i nijedan paket\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nijedan paket ne zahteva %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbe�uje %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogre�an broj paketa: %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "ne mogu da pro�itam slog %d\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
diff --git a/po/sv.po b/po/sv.po
index 4b2ca32c8..559892884 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2002-08-19 22:26+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -50,12 +50,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "Filen %s tycks inte vara en specfil.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger m�lplattformar: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger f�r m�let %s\n"
@@ -121,111 +121,111 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Detta program kan distribueras fritt enligt villkoren i GNU GPL\n"
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Internt fel i argumenthantering (%d) :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "enbart ett huvudl�ge kan anges"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "endast en typ av fr�ga/verifiering kan utf�ras �t g�ngen"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "ov�ntade fr�geflaggor"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "ov�ntat fr�geformat"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "ov�ntad fr�gek�lla"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr "filer kan relokeras endast under paketinstallation"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate och --excludepath kan endast anv�ndas n�r nya paket installeras"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan endast anv�ndas n�r nya paket installeras"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "argument till --prefix m�ste b�rja med /"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "enbart en av --excludedocs och --includedocs kan anv�ndas"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan enbart anv�ndas n�r paket raderas"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb kan enbart anv�ndas n�r paket installeras eller raderas"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -233,7 +233,7 @@ msgstr ""
 "skriptinaktiveringsflaggor kan enbart anv�ndas n�r paket installeras eller "
 "raderas"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -241,7 +241,7 @@ msgstr ""
 "utl�sarinaktiveringsflaggor kan enbart anv�ndas n�r paket installeras eller "
 "raderas"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -249,13 +249,13 @@ msgstr ""
 "--nodeps kan enbart anv�ndas n�r paket byggs, byggs om, kompileras om, "
 "installeras, raderas eller verifieras"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test kan enbart anv�ndas n�r paket installeras, raderas eller byggs"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -263,77 +263,77 @@ msgstr ""
 "--root (-r) kan enbart anv�ndas n�r paket installeras, raderas, fr�gas eller "
 "databasen byggs om"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argument till --root (-r) m�ste b�rja med /"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "inga filer att signera\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan inte komma �t filen %s\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp hittades inte: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "Ange l�senfras: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Kontrollen av l�senfrasen misslyckades\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "L�senfrasen �r ok.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Felaktig %%_signature-spec i makrofil.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign kan enbart anv�ndas vid paketbyggnation"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna f�r ombyggnation"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "inga specfiler angivna f�r byggnation"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna f�r byggnation"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 msgid "no packages given for erase"
 msgstr "inga paket angivna att radera"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "inga paket angivna f�r installation"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna f�r fr�ga"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna f�r verifiering"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr "inga argument angivna"
 
@@ -1088,11 +1088,11 @@ msgstr "%s:%d: Fick ett %%endif utan n�got %%if\n"
 msgid "malformed %%include statement\n"
 msgstr "felformaterad %%include-sats\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr "Hittade inga kompatibla arkitekturer att bygga\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paketet har ingen %%description: %s\n"
@@ -1266,21 +1266,31 @@ msgstr "�sidos�tt m�lplattform"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "sl� upp �versatta str�ngar i specfilkatalog"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "rad %d: Felaktigt tal: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "rad %d: Felaktigt no%s-tal: %d\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "rad %d: Felaktigt %s-tal: %s\n"
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr "kan inte fr�ga %s: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "fr�ga av specfil %s misslyckades, kan inte tolka\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2184,140 +2194,130 @@ msgstr "%s misslyckades p� fil %s: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "fel format: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(inneh�ller inga filer)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "ersatt        "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "oinstallerat  "
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "n�tdelad      "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(ej tillstnd) "
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ok�nd %3d)   "
 
-#: lib/query.c:279
+#: lib/query.c:278
 msgid "package has not file owner/group lists\n"
 msgstr "paketet har inte fil�gare-/-grupplistor\n"
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr "paketet har varken fil�gare eller id-listor\n"
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr "kan inte fr�ga %s: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades med att �ppna %s: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "fr�ga av %s misslyckades\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "k�llpaket i gammalt format g�r inte att fr�ga om\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s: inte ett rpm-paket (eller paketspecifikation): %s\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "fr�ga av specfil %s misslyckades, kan inte tolka\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr "inga paket\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupp %s inneh�ller inga paket\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "inga paketutl�sare %s\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "felformaterad %s: %s\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "inga paket matchar %s: %s\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "inget paket beh�ver %s\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "inget paket tillhandah�ller %s\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tillh�r inget paket\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paketpost nummer: %u\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "post %u kunde inte l�sas\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s �r inte installerat\n"
diff --git a/po/tr.po b/po/tr.po
index e6eecc973..8462f43f4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-21 15:30-0500\n"
+"POT-Creation-Date: 2002-12-21 21:09-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -52,12 +52,12 @@ msgid "File %s does not appear to be a specfile.\n"
 msgstr "%s bir spec dosyas� gibi g�r�nm�yor.\n"
 
 #. parse up the build operators
-#: build.c:319
+#: build.c:324
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Hedef platformlar derleniyor: %s\n"
 
-#: build.c:334
+#: build.c:339
 #, c-format
 msgid "Building for target %s\n"
 msgstr "%s i�in derleniyor\n"
@@ -126,114 +126,114 @@ msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Bu program GNU GPL ko�ullar�na uygun olarak serbest�e da��t�labilir."
 
-#: rpmqv.c:301
+#: rpmqv.c:295
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "(%d) arg�man� i�lenirken i� hata olu�tu :-(\n"
 
-#: rpmqv.c:339 rpmqv.c:345 rpmqv.c:351 rpmqv.c:388
+#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
 msgid "only one major mode may be specified"
 msgstr "sadece bir ana kip belirtilebilir"
 
-#: rpmqv.c:367
+#: rpmqv.c:361
 msgid "one type of query/verify may be performed at a time"
 msgstr "bir anda sadece bir tarz sorgulama/denetleme yap�labilir"
 
-#: rpmqv.c:371
+#: rpmqv.c:365
 msgid "unexpected query flags"
 msgstr "beklenmeyen sorgulama bayraklar�"
 
-#: rpmqv.c:374
+#: rpmqv.c:368
 msgid "unexpected query format"
 msgstr "beklenmeyen sorgulama bi�emi"
 
-#: rpmqv.c:377
+#: rpmqv.c:371
 msgid "unexpected query source"
 msgstr "beklenmeyen sorgulama kayna��"
 
-#: rpmqv.c:419
+#: rpmqv.c:413
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "sadece  kaynak ve spec silme i�lemleri, kurma, g�ncelleme i�lemleri i�in "
 "zorlanabilir"
 
-#: rpmqv.c:421
+#: rpmqv.c:415
 msgid "files may only be relocated during package installation"
 msgstr ""
 "dosyalar sadece paket kurulumu s�ras�nda yeni yerlerine yerle�tirilebilir"
 
-#: rpmqv.c:424
+#: rpmqv.c:418
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:421
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate ve --excludepath sadece yeni paket kurulumunda kullan�labilir"
 
-#: rpmqv.c:430
+#: rpmqv.c:424
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix sadece yeni paketlerin kurulmas� s�ras�nda kullan�labilir"
 
-#: rpmqv.c:433
+#: rpmqv.c:427
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ile belirtilenler '/' ile ba�lamal�"
 
-#: rpmqv.c:436
+#: rpmqv.c:430
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:440
+#: rpmqv.c:434
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:445
+#: rpmqv.c:439
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:449
+#: rpmqv.c:443
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:453
+#: rpmqv.c:447
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:457
+#: rpmqv.c:451
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:461
+#: rpmqv.c:455
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ve --includedocs bir arada kullan�lamaz"
 
-#: rpmqv.c:465
+#: rpmqv.c:459
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:469
+#: rpmqv.c:463
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:474
+#: rpmqv.c:468
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:478
+#: rpmqv.c:472
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:482
+#: rpmqv.c:476
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:487
+#: rpmqv.c:481
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb sadece paket kurulumu ve kald�r�lmas� s�ras�nda kullan�labilir"
 
-#: rpmqv.c:492
+#: rpmqv.c:486
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -241,7 +241,7 @@ msgstr ""
 "betik iptal etme se�enekleri sadece paketin kurulmas� ve silinmesi s�ras�nda "
 "kullan�labilir"
 
-#: rpmqv.c:497
+#: rpmqv.c:491
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -249,7 +249,7 @@ msgstr ""
 "tetikleme iptal se�enekleri sadece paketin kurulmas� ve silinmesi s�ras�nda "
 "kullan�labilir"
 
-#: rpmqv.c:501
+#: rpmqv.c:495
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -257,7 +257,7 @@ msgstr ""
 "--nodeps sadece paket olu�turma, yeniden olu�turma, yeniden derleme, "
 "kurulum, kald�rma ve denetleme i�lemlerinde kullan�labilir"
 
-#: rpmqv.c:506
+#: rpmqv.c:500
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -265,7 +265,7 @@ msgstr ""
 "--test sadece paket kurulumu, kald�r�lmas� ve olu�turulmas� i�lemlerinde "
 "kullan�labilir"
 
-#: rpmqv.c:511
+#: rpmqv.c:505
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -273,78 +273,78 @@ msgstr ""
 "--root (-r) sadece kurulum, kald�rma, sorgulama ve yeniden veritaban� "
 "olu�turma i�lemlerinde kullan�labilir"
 
-#: rpmqv.c:523
+#: rpmqv.c:517
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ile verilenler '/' ile ba�lamal�"
 
-#: rpmqv.c:547
+#: rpmqv.c:541
 msgid "no files to sign\n"
 msgstr "imzalanacak dosya yok\n"
 
-#: rpmqv.c:552
+#: rpmqv.c:546
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "%s dosyas� bulunam�yor\n"
 
-#: rpmqv.c:571
+#: rpmqv.c:565
 msgid "pgp not found: "
 msgstr "pgp bulunamad�: "
 
-#: rpmqv.c:576
+#: rpmqv.c:570
 msgid "Enter pass phrase: "
 msgstr "Anahtar parolas�n� girin: "
 
-#: rpmqv.c:578
+#: rpmqv.c:572
 msgid "Pass phrase check failed\n"
 msgstr "Anahtar parolas� kontrol� ba�ar�s�z\n"
 
-#: rpmqv.c:582
+#: rpmqv.c:576
 msgid "Pass phrase is good.\n"
 msgstr "Anahtar parolas� do�ru.\n"
 
-#: rpmqv.c:587
+#: rpmqv.c:581
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Makro dosyas�ndaki %%_signature spec ge�ersiz.\n"
 
-#: rpmqv.c:594
+#: rpmqv.c:588
 msgid "--sign may only be used during package building"
 msgstr "--sign sadece paket olu�turulurken kullan�labilir"
 
-#: rpmqv.c:611
+#: rpmqv.c:605
 msgid "exec failed\n"
 msgstr "icra ba�ar�s�z\n"
 
-#: rpmqv.c:647
+#: rpmqv.c:641
 msgid "no packages files given for rebuild"
 msgstr "yeniden olu�turmak i�in paket dosyalar� belirtilmemi�"
 
-#: rpmqv.c:717
+#: rpmqv.c:711
 msgid "no spec files given for build"
 msgstr "olu�turma i�in gerekli spec dosyas� belirtilmemi�"
 
-#: rpmqv.c:719
+#: rpmqv.c:713
 msgid "no tar files given for build"
 msgstr "olu�turma i�in gereken tar dosyalar� belirtilmemi�"
 
-#: rpmqv.c:741
+#: rpmqv.c:735
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "y�klenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:781
+#: rpmqv.c:775
 msgid "no packages given for install"
 msgstr "y�klenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:797
+#: rpmqv.c:791
 msgid "no arguments given for query"
 msgstr "sorgulama i�in hi� arg�man belirtilmedi"
 
-#: rpmqv.c:810
+#: rpmqv.c:808
 msgid "no arguments given for verify"
 msgstr "denetleme i�in hi� arg�man belirtilmedi"
 
-#: rpmqv.c:827
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "sorgulama i�in hi� arg�man belirtilmedi"
@@ -1103,11 +1103,11 @@ msgstr "%s:%d: %%if'siz bir %%endif al�nd�\n"
 msgid "malformed %%include statement\n"
 msgstr "%%include deyimi bozuk\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:543
 msgid "No compatible architectures found for build\n"
 msgstr "Kurgulamak i�in uyumlu mimari yok\n"
 
-#: build/parseSpec.c:603
+#: build/parseSpec.c:601
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket %%description i�ermiyor: %s\n"
@@ -1292,21 +1292,31 @@ msgstr "hedef platforma zorlar"
 msgid "lookup i18N strings in specfile catalog"
 msgstr "spec dosyas�ndaki i18n iletilerine bakar"
 
-#: build/spec.c:233
+#: build/spec.c:234
 #, c-format
 msgid "line %d: Bad number: %s\n"
 msgstr "sat�r %d: Numara hatal�: %s\n"
 
-#: build/spec.c:239
+#: build/spec.c:240
 #, c-format
 msgid "line %d: Bad no%s number: %d\n"
 msgstr "sat�r %d: Hatal� no%s numaras�: %d\n"
 
-#: build/spec.c:302
+#: build/spec.c:303
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "sat�r %d: Hatal� %s numaras�: %s\n"
 
+#: build/spec.c:639
+#, c-format
+msgid "can't query %s: %s\n"
+msgstr "%s sorgulanam�yor: %s\n"
+
+#: build/spec.c:714
+#, c-format
+msgid "query of specfile %s failed, can't parse\n"
+msgstr "%s spec dosyas�n�n sorgulanmas� ba�ar�s�z, ��z�mlenemiyor\n"
+
 #: lib/cpio.c:207
 #, c-format
 msgid "(error 0x%x)"
@@ -2246,141 +2256,131 @@ msgstr "%s a��lamad�: %s\n"
 msgid "%s failed: %s\n"
 msgstr "%s ba�ar�s�z\n"
 
-#: lib/query.c:122 lib/rpmts.c:430
+#: lib/query.c:121 lib/rpmts.c:430
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "bi�em yanl��: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:181
+#: lib/query.c:180
 msgid "(contains no files)"
 msgstr "(hi� dosya i�ermiyor)"
 
-#: lib/query.c:246
+#: lib/query.c:245
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:249
+#: lib/query.c:248
 msgid "replaced      "
 msgstr "yerine        "
 
-#: lib/query.c:252
+#: lib/query.c:251
 msgid "not installed "
 msgstr "y�klenmedi "
 
-#: lib/query.c:255
+#: lib/query.c:254
 msgid "net shared    "
 msgstr "a� payla��ml� "
 
-#: lib/query.c:258
+#: lib/query.c:257
 msgid "(no state)    "
 msgstr "(durumsuz)    "
 
-#: lib/query.c:261
+#: lib/query.c:260
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(bilinmeyen %3d)"
 
-#: lib/query.c:279
+#: lib/query.c:278
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "paket ne dosya sahibi ne de kimlik listesi i�eriyor\n"
 
-#: lib/query.c:312
+#: lib/query.c:311
 msgid "package has neither file owner or id lists\n"
 msgstr "paket ne dosya sahibi ne de kimlik listesi i�eriyor\n"
 
-#: lib/query.c:408
-#, c-format
-msgid "can't query %s: %s\n"
-msgstr "%s sorgulanam�yor: %s\n"
-
-#: lib/query.c:569 lib/query.c:616 lib/rpminstall.c:123 lib/rpminstall.c:458
+#: lib/query.c:439 lib/query.c:486 lib/rpminstall.c:123 lib/rpminstall.c:458
 #: lib/rpminstall.c:589 lib/rpminstall.c:1005 lib/rpmts.c:441
 #: tools/rpmgraph.c:127 tools/rpmgraph.c:164
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: lib/query.c:584
+#: lib/query.c:454
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s 'nin sorgulamas� ba�ar�s�zl�kla sonu�land�\n"
 
-#: lib/query.c:594
+#: lib/query.c:464
 msgid "old format source packages cannot be queried\n"
 msgstr "eski bi�em kaynak paketleri sorgulanamaz\n"
 
-#: lib/query.c:627 lib/rpminstall.c:602
+#: lib/query.c:497 lib/rpminstall.c:602
 #, fuzzy, c-format
 msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:671
-#, c-format
-msgid "query of specfile %s failed, can't parse\n"
-msgstr "%s spec dosyas�n�n sorgulanmas� ba�ar�s�z, ��z�mlenemiyor\n"
-
-#: lib/query.c:692
+#: lib/query.c:526
 msgid "no packages\n"
 msgstr "paket yok\n"
 
-#: lib/query.c:712
+#: lib/query.c:546
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s grubu hi� paket i�ermiyor\n"
 
-#: lib/query.c:722
+#: lib/query.c:556
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:736 lib/query.c:758 lib/query.c:779 lib/query.c:814
+#: lib/query.c:570 lib/query.c:592 lib/query.c:613 lib/query.c:648
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s okunamad�: %s.\n"
 
-#: lib/query.c:746 lib/query.c:764 lib/query.c:789 lib/query.c:819
+#: lib/query.c:580 lib/query.c:598 lib/query.c:623 lib/query.c:653
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:830
+#: lib/query.c:664
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s gerektiren paket yok\n"
 
-#: lib/query.c:841
+#: lib/query.c:675
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s sa�layan paket yok\n"
 
-#: lib/query.c:875
+#: lib/query.c:709
 #, c-format
 msgid "file %s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: lib/query.c:879
+#: lib/query.c:713
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s dosyas�, hi� bir pakete ait de�il\n"
 
-#: lib/query.c:906
+#: lib/query.c:740
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ge�ersiz paket numaras�: %s\n"
 
-#: lib/query.c:909
+#: lib/query.c:743
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paket kay�t numaras�: %u\n"
 
-#: lib/query.c:914
+#: lib/query.c:748
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "%u. kay�t okunamad�\n"
 
-#: lib/query.c:925 lib/rpminstall.c:773
+#: lib/query.c:759 lib/rpminstall.c:773
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu de�il\n"
diff --git a/rpm.spec.in b/rpm.spec.in
index 0e74ff882..a66a5c94b 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -466,6 +466,8 @@ exit 0
 - add rpmdb_{deadlock,dump,load,svc,stat,verify} utilities.
 - include srpm pkgid in binary headers (#71460).
 - add %check scriptlet to run after %install (#64137).
+- simplify specfile query linkage loop.
+- drill rpmts into parseSpec(), carrying Spec along.
 
 * Fri Dec 20 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.33
 - dynamically link /bin/rpm, link against good old -lpthread.
diff --git a/rpmdb/hdrinline.h b/rpmdb/hdrinline.h
index 8a8637632..83f38463d 100644
--- a/rpmdb/hdrinline.h
+++ b/rpmdb/hdrinline.h
@@ -3,7 +3,7 @@
 #define H_HDRINLINE
 
 /** \ingroup header
- * \file lib/hdrinline.h
+ * \file rpmdb/hdrinline.h
  */
 
 #ifdef __cplusplus
diff --git a/rpmpopt.in b/rpmpopt.in
index f9bc8afcd..45c1b5f09 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -60,7 +60,7 @@ rpm	alias -R --requires
 rpm	alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\n\
 Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
 Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
-Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
+Install Date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
 Group       : %-27{GROUP}   Source RPM: %{SOURCERPM}\n\
 Size        : %-27{SIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
 Signature   : %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n\
@@ -328,7 +328,7 @@ rpmq	alias -R --requires
 rpmq	alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\n\
 Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
 Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
-Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
+Install Date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
 Group       : %-27{GROUP}   Source RPM: %{SOURCERPM}\n\
 Size        : %-27{SIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
 Signature   : %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n\
@@ -401,7 +401,7 @@ rpmquery	alias -R --requires
 rpmquery	alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\n\
 Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
 Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
-Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
+Install Date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
 Group       : %-27{GROUP}   Source RPM: %{SOURCERPM}\n\
 Size        : %-27{SIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
 %|PACKAGER?{Packager    : %{PACKAGER}\n}|\
diff --git a/rpmqv.c b/rpmqv.c
index 608ca3d0e..ae2afa2f1 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -263,12 +263,6 @@ int main(int argc, const char ** argv)
     default:
 	break;
     }
-
-    /* XXX Eliminate query linkage loop */
-    /*@-type@*/	/* FIX: casts? */
-    parseSpecVec = parseSpec;
-    freeSpecVec = freeSpec;
-    /*@=type@*/
 #endif
 
 #if defined(ENABLE_NLS)
@@ -795,7 +789,11 @@ ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
     case MODE_QUERY:
 	if (qva->qva_source != RPMQV_ALL && !poptPeekArg(optCon))
 	    argerror(_("no arguments given for query"));
+
+	qva->qva_specQuery = rpmspecQuery;
 	ec = rpmcliQuery(ts, qva, (const char **) poptGetArgs(optCon));
+	qva->qva_specQuery = NULL;
+
 	/* XXX don't overflow single byte exit status */
 	if (ec > 255) ec = 255;
 	break;