- simplify specfile query linkage loop.

- drill rpmts into parseSpec(), carrying Spec along.

CVS patchset: 5958
CVS date: 2002/12/22 02:11:05

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;