- change popt exec alias in oreder to exec rpm children.

- split rpm into 5 pieces along major mode fault lines with popt glue.

CVS patchset: 3750
CVS date: 2000/05/24 17:53:35

31 files changed, 6037 insertions, 5068 deletions

diff --git a/.cvsignore b/.cvsignore
index 11bcc8b38..9b3fdcc91 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -23,6 +23,8 @@ ltmain.sh
 macros
 platform
 rpm
+rpmdb
+rpm[a-z]
 rpm2cpio
 rpmconvert
 rpmpopt
diff --git a/CHANGES b/CHANGES
index f4d762bde..a7f99ca1c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -44,6 +44,8 @@
 	- builds against bzip2 1.0
 	- detects and builds properly against the new fopencookie API in
           glibc 2.2
+	- change popt exec alias in oreder to exec rpm children.
+	- split rpm into 5 pieces along major mode fault lines with popt glue.
 	
 3.0.3 -> 3.0.4
 	- use compressed filenames on install side.
diff --git a/Makefile.am b/Makefile.am
index dfac6b13c..57eaf1055 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,18 +17,17 @@ SUBDIRS = intl po popt build lib misc tools scripts tests doc .
 INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
 	@INCPATH@
 
-myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
+myLDFLAGS = -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
 
 # XXX libtool can/should generate dependent libs.
 # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
-myldadd= \
+myLDADD = \
 	$(top_builddir)/build/.libs/librpmbuild.a \
 	$(top_builddir)/lib/.libs/librpm.a \
 	$(top_builddir)/popt/.libs/libpopt.a \
 	@INTLLIBS@ @LIBMISC@
 
-LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
-LDADD = $(myldadd)
+newLDADD = -lrpmbuild -lrpm -lpopt @INTLLIBS@ @LIBMISC@
 
 rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
 rpmbin_PROGRAMS = rpm
@@ -38,36 +37,83 @@ bin_SCRIPTS =		gendiff
 
 noinst_PROGRAMS =	@BUILD_RPMCONVERT@
 
-pkglibdir = @RPMCONFIGDIR@
-pkglib_DATA = rpmrc rpmpopt macros
-pkglib_SCRIPTS = find-provides find-requires mkinstalldirs \
-	config.guess config.sub
+pkglibdir =		@RPMCONFIGDIR@
+pkglib_PROGRAMS =	rpmb rpmdb rpmi rpmk rpmq
+pkglib_DATA =		rpmrc rpmpopt macros
+pkglib_SCRIPTS =	find-provides find-requires mkinstalldirs \
+			config.guess config.sub
 
 noinst_HEADERS = \
 	acconfig.h	build.h		system.h
 
 rpm_SOURCES =		build.c rpm.c
+rpm_LDFLAGS =		@LDFLAGS_STATIC@ $(myLDFLAGS)
+rpm_LDADD =		$(myLDADD)
+
+rpmb_SOURCES =		build.c
+rpmb_LDFLAGS =		$(myLDFLAGS)
+rpmb_LDADD =		rpmb.o $(newLDADD)
+rpmb.o:	rpmqv.c
+	$(COMPILE) -DIAM_RPMBT -o $@ -c $<
+
+rpmdb_SOURCES =
+rpmdb_LDFLAGS =		$(myLDFLAGS)
+rpmdb_LDADD =		rpmdb.o $(newLDADD)
+rpmdb.o:	rpmqv.c
+	$(COMPILE) -DIAM_RPMDB -o $@ -c $<
+
+rpmi_SOURCES =
+rpmi_LDFLAGS =		$(myLDFLAGS)
+rpmi_LDADD =		rpmi.o $(newLDADD)
+rpmi.o:	rpmqv.c
+	$(COMPILE) -DIAM_RPMEIU -o $@ -c $<
+
+rpmk_SOURCES =
+rpmk_LDFLAGS =		$(myLDFLAGS)
+rpmk_LDADD =		rpmk.o $(newLDADD)
+rpmk.o:	rpmqv.c
+	$(COMPILE) -DIAM_RPMK -o $@ -c $<
+
+rpmq_SOURCES =
+rpmq_LDFLAGS =		$(myLDFLAGS)
+rpmq_LDADD =		rpmq.o $(newLDADD)
+rpmq.o:	rpmqv.c
+	$(COMPILE) -DIAM_RPMQV -o $@ -c $<
 
-$(PROGRAMS): 		$(myldadd)
+rpm2cpio_SOURCES =	rpm2cpio.c
+rpm2cpio_LDFLAGS =	@LDFLAGS_STATIC@ $(myLDFLAGS)
+rpm2cpio_LDADD =	$(myLDADD)
+
+rpmconvert_SOURCES =	convertdb.c oldrpmdb.c
+## Libmisc.a is required for rpmconvert.
+rpmconvert_LDADD =	$(myLDADD) -lgdbm
+
+$(PROGRAMS): 		$(myLDADD)
 
 .PHONY:	lclint
 lclint:
-	lclint ${DEFS} ${INCLUDES} ${rpm_SOURCES}
+	lclint $(DEFS) $(INCLUDES) $(rpm_SOURCES)
 
 CVSTAG = r$(subst .,-,$(VERSION))
 
-rpm2cpio_SOURCES =	rpm2cpio.c
-
-rpmconvert_SOURCES =	convertdb.c oldrpmdb.c
-## Libmisc.a is required for rpmconvert.
-rpmconvert_LDADD =	$(myldadd) -lgdbm
-
 install-data-local:
 	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
 	@rm -f $(DESTDIR)/$(libdir)/rpmrc
-	@ln -s rpm/rpmrc $(DESTDIR)/$(libdir)/rpmrc
+	@@LN_S@ rpm/rpmrc $(DESTDIR)/$(libdir)/rpmrc
 	@rm -f $(DESTDIR)/$(libdir)/rpmpopt
-	@ln -s rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt
+	@@LN_S@ rpm/rpmpopt $(DESTDIR)/$(libdir)/rpmpopt
+	@rm -f $(DESTDIR)/$(libdir)/rpm/rpmt
+	@@LN_S@ rpmb $(DESTDIR)/$(libdir)/rpm/rpmt
+	@rm -f $(DESTDIR)/$(libdir)/rpm/rpme
+	@@LN_S@ rpmi $(DESTDIR)/$(libdir)/rpm/rpme
+	@rm -f $(DESTDIR)/$(libdir)/rpm/rpmu
+	@@LN_S@ rpmi $(DESTDIR)/$(libdir)/rpm/rpmu
+	@rm -f $(DESTDIR)/$(libdir)/rpm/rpmv
+	@@LN_S@ rpmq $(DESTDIR)/$(libdir)/rpm/rpmv
+	for bf in b db e i k q t u v ; do \
+	    rm -f $(DESTDIR)/$(bindir)/rpm$$bf ; \
+	    @LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)/$(bindir)/rpm$$bf ; \
+	done
 	@$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/BUILD
 	@case "@build_cpu@" in \
 	*86) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/i386 ;;\
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index b7743aa51..63dc51b34 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -497,7 +497,7 @@ static inline int dbiAppendSet(dbiIndexSet set, const void * recs,
 	? xmalloc(nrecs * sizeof(*(set->recs)))
 	: xrealloc(set->recs, (set->count + nrecs) * sizeof(*(set->recs)));
 
-    memset(set->recs + set->count, 0, nrecs * sizeof(*recs));
+    memset(set->recs + set->count, 0, nrecs * sizeof(*(set->recs)));
 
     while (nrecs-- > 0) {
 	memcpy(set->recs + set->count, rptr, rlen);
diff --git a/po/cs.po b/po/cs.po
index db27182dd..c1894352d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -93,7 +93,7 @@ msgstr "neověřovat operační systém balíčku"
 msgid "override build root"
 msgstr "použít <adr> jako sestavovací kořen"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "po dokončení odstranit sestavovací strom"
 
@@ -106,7 +106,7 @@ msgstr "nespouštět žádné etapy"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "po dokončení odstranit zdroje a soubor .spec"
@@ -116,7 +116,7 @@ msgstr "po dokončení odstranit zdroje a soubor .spec"
 msgid "remove specfile when done"
 msgstr "po dokončení odstranit zdroje a soubor .spec"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "přeskočit přímo na určenou etapu (pouze pro c,i)"
 
@@ -172,79 +172,80 @@ msgstr "balíček %s nenalezen v %s"
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verze %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (c) 1998 - Red Hat Software"
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Tento program lze volně rozšiřovat podle podmínek GNU GPL."
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "použití: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <adr>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <adr>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <soubor>] [--ignorearch] [--dbpath <adr>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <adr>] [--ignoreos] [--nodeps] [--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                        [--ftpproxy <hostitel>] [--ftpport <port>] [--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <hostitel>] [--ftpport <port>]"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate starácesta=novácesta]"
 
-#: rpm.c:235
+#: rpm.c:246
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
@@ -252,374 +253,408 @@ msgstr ""
 "                        [--badreloc] [--notriggers] soubor1.rpm ... "
 "souborN.rpm"
 
-#: rpm.c:236
+#: rpm.c:247
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] soubor1.rpm ... souborN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <adr>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <soubor>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <adr>] [--prefix <adr>] "
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <hostitel>] [--ftpport <port>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:245
+#: rpm.c:256
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--changelog] [--dbpath <adr>] [cíle]"
 
-#: rpm.c:246
+#: rpm.c:257
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] soubor1.rpm ... souborN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <adr>] [--rcfile <soubor>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy "
 "<hostitel>]"
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:253
+#: rpm.c:264
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <adr>] [cíle]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <adr>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [cíle]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [cíl]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [cíl]"
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] soubor1.rpm ... souborN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <adr>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 "                        [--justdb] [--notriggers] rbalíček1 ... balíčekN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile "
 "<soubor>]"
 
-#: rpm.c:264
+#: rpm.c:275
 #, fuzzy
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 "                        [--sign] [--test] [--timecheck <s>] [--buildos <os>]"
 
-#: rpm.c:265
+#: rpm.c:276
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--buildarch <arch>] [--rmsource] soubor.spec"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--buildarch <arch>] [--rmsource] soubor.spec"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "       rpm {--rmsource} [--rcfile <soubor>] [-v] soubor.spec"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--resign} [--rcfile <soubor>] balíček1 balíček2 ... balíčekN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <soubor>] balíček1 balíček2 ... balíčekN"
 
-#: rpm.c:272
+#: rpm.c:283
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <soubor>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           balíček1 ... balíčekN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <soubor>] [--dbpath <adr>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "použití:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "vytisknout tuto zprávu"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "vytisknout používanou verzi rpm"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   všechny režimy podporují tyto argumenty:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
-msgstr "      --rcfile <soubor>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
+msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "použijte <soubor> místo /etc/rpmrc a $HOME/.rpmrc"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "o něco popisnější režim"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    --pipe <příkaz>       "
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "velmi popisný režim (pro odlaďování)"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "vytisknout používanou verzi rpm"
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "dotazovací režim"
+#: rpm.c:332
+msgid "    --pipe <cmd>          "
+msgstr "    --pipe <příkaz>       "
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr "      --root <adr>        "
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "odeslat stdout do <příkazu>"
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "použít <adr> jako adresář vrcholové úrovně"
+#: rpm.c:334
+#, fuzzy
+msgid "    --rcfile <file>       "
+msgstr "      --rcfile <soubor>     "
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
-msgstr "      --dbpath <adr>      "
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "použijte <soubor> místo /etc/rpmrc a $HOME/.rpmrc"
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "použít <adr> jako adresář pro databázi"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
+msgstr ""
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
-msgstr "      --queryformat <qfmt>"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "o něco popisnější režim"
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "použít <qfmt> jako hlavičkový formát (implikuje -i)"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "velmi popisný režim (pro odlaďování)"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   instalace, aktualizace a dotazování (s -p) umožňují použití URL-adres ftp"
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr "   místo názvů souborů včetně následujících voleb:"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <hostitel> "
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "název hostitele či IP pro ftp-proxy"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "číslo portu serveru ftp (nebo proxy)"
 
-#: rpm.c:335
+#: rpm.c:350
 #, fuzzy
-msgid "      --httpproxy <host>   "
+msgid "      --httpproxy <host>  "
 msgstr "      --ftpproxy <hostitel> "
 
-#: rpm.c:336
+#: rpm.c:351
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "název hostitele či IP pro ftp-proxy"
 
-#: rpm.c:337
+#: rpm.c:352
 #, fuzzy
-msgid "      --httpport <port>    "
+msgid "      --httpport <port>   "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:338
+#: rpm.c:353
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "číslo portu serveru ftp (nebo proxy)"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "dotazovací režim"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr "      --dbpath <adr>      "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "použít <adr> jako adresář pro databázi"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr "      --queryformat <qfmt>"
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "použít <qfmt> jako hlavičkový formát (implikuje -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr "      --root <adr>        "
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "použít <adr> jako adresář vrcholové úrovně"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Volby pro specifikaci balíčku:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "dotazovat všechny balíčky"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr "        -f <soubor>+      "
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "dotazy na balíček vlastnící <soubor>"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr "        -p <souborbalíku>+  "
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "dotazovat (nenainstalovaný) balíček <souborbalíku>"
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <balík>"
 
-#: rpm.c:347
+#: rpm.c:372
 msgid "query packages triggered by <pkg>"
 msgstr "dotazy na balíčky aktivované <balíkem>"
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <sch>"
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr "dotazovat balíčky poskytující schopnost <sch>"
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <sch>"
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr "dotazovat balíčky vyžadující schopnost <sch>"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Volby pro vyběr informací:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "zobrazit informace o balíčku"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "zobrazit protokol o změnách balíčku"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "zobrazit seznam souborů balíčků"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "zobrazit stavy souborů (implikuje -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "uvést pouze dokumentační soubory (implikuje -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "uvést pouze konfigurační soubory (implikuje -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -627,35 +662,23 @@ msgstr ""
 "zobrazit všechny ověřitelné údaje pro každý soubor (musí se použít s -l, -c "
 "nebo -d)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "uvést schopnosti poskytované balíčkem"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr "        --requires"
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "uvést závislosti balíčků"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "vytisknout různé [de]instalační skripty"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr "zobrazit aktivační skripty obsažené v balíčku"
 
-#: rpm.c:379
-msgid "    --pipe <cmd>          "
-msgstr "    --pipe <příkaz>       "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "odeslat stdout do <příkazu>"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -663,154 +686,143 @@ msgstr ""
 "ověřit instalaci balíčku použitím stejných voleb pro specifikaci balíčku, "
 "jako pro -q"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "neověřovat závislosti balíčků"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "neověřovat kontrolní součty souborů md5"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "neověřovat atributy souborů"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"nastavit oprávnění souborů dle údajů v databázi balíčků pomocí stejných "
-"voleb pro specifikaci balíčku, jako pro -q"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"nastavit vlastníka a skupinu souborů dle údajů v databázi balíčků pomocí "
-"stejných voleb pro specifikaci balíčku, jako pro -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "uvést příznaky, které lze použít v dotazovacím formátu"
 
-#: rpm.c:402
+#: rpm.c:418
 msgid "    --install <packagefile>"
 msgstr "    --install <souborbalíku>"
 
-#: rpm.c:403
+#: rpm.c:419
 msgid "    -i <packagefile>      "
 msgstr "    -i <souborbalíku>     "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "nainstalovat balíček"
 
-#: rpm.c:405
+#: rpm.c:421
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "      --relocate <starácesta>=<novácesta>"
 
-#: rpm.c:406
+#: rpm.c:422
 #, fuzzy
 msgid "skip files in path <path>"
 msgstr "soubor %s je sdílen\n"
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <starácesta>=<novácesta>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "přemístit soubory ze <starécesty> na <novoucestu>"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "přemístit soubory, i když to balíček nedovoluje"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "balíček %s není nainstalován\n"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <adr>      "
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "přemístit soubory do <adr>, jsou-li přemístitelné"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "neinstalovat dokumentaci"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "zkratka pro --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "během instalace balíčku zobrazit dvojité křížky (dobré s -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "nainstalovat všechny soubory; i konfigurace, které by se jinak mohly vynechat"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "neověřovat architekturu balíčku"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "neověřovat operační systém balíčku"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "nainstalovat dokumentaci"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "inovovat databázi, ale neupravovat souborový systém"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "pro vyřešení závislostí neměnit pořadí instalace balíčků"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "nespouštět žádné instalační skripty"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr "nespouštět žádné skripty aktivované tímto balíčkem"
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "během instalace balíčku zobrazit procenta"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "instalovat, i když balíček nahradí nainstalované soubory"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "přeinstalovat, i když je již balíček přítomen"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "neinstalovat ale sdělit, zda-li by to fungovalo či nikoli"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <souborbalíku>"
 
-#: rpm.c:455
+#: rpm.c:471
 msgid "    -U <packagefile>      "
 msgstr "    -U <souborbalíku>      "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "aktualizovat balíček (stejné možnosti jako --install, plus)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -818,15 +830,15 @@ msgstr ""
 "aktualizovat na starou verzi balíčku (--force to dělá při aktualizacích "
 "automaticky)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr "    --erase <balíček>"
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "smazat (deinstalovat) balíček"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -834,90 +846,91 @@ msgstr ""
 "odstranit všechny balíčky odpovídající <balíčku> (obvykle se generuje chyba, "
 "specifikuje-li <balíček> více balíčků)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "nespouštět žádné skripty určené pro balíčky"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<etapa> <.spec>     "
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etapa> <klubkotar> "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "sestavit balíček, kde <etapa> je jedna z:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "příprava (rozbalí zdroje a aplikuje záplaty)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrola seznamů (provede zběžné kontroly %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "kompilace (příprava a kompilace)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "instalace (příprava, kompilace a instalace)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "binární balíček (příprava, kompilace, instalace, zabalení)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "balíček bin/src (příprava, kompilace, instalace, zabalení)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
 msgstr "po dokončení odstranit zdroje a soubor .spec"
 
-#: rpm.c:502
+#: rpm.c:520
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "generovat podpis PGP"
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <adr>   "
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "použít <adr> jako sestavovací kořen"
 
-#: rpm.c:505
+#: rpm.c:523
 #, fuzzy
 msgid "      --target=<platform>+"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "nespouštět žádné etapy"
 
-#: rpm.c:509
+#: rpm.c:527
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <s>     "
 
-#: rpm.c:510
+#: rpm.c:528
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "nastavit časovou kontrolu na <s> sekund (0 ji deaktivuje)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <zdrojbalík>"
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -925,229 +938,239 @@ msgstr ""
 "instalovat zdrojový balíček, sestavit binární balíček a odstranit soubor "
 ".spec, zdroje, záplaty i ikony."
 
-#: rpm.c:514
-msgid "    --rmsource <spec>     "
-msgstr "    --rmsource <.spec>    "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "odstranit zdroje a soubor .spec"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <zdrojbal>"
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "jako --rebuild, ale nesestavovat žádné balíčky"
 
-#: rpm.c:518
+#: rpm.c:536
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <balík>+     "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "podepsat balíček (zahodit aktuální podpis)"
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <balík>+    "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "přidat k balíčku podpis"
 
-#: rpm.c:523
-msgid "    --checksig <pkg>+     "
+#: rpm.c:540
+#, fuzzy
+msgid "    --checksig <pkg>+"
 msgstr "    --checksig <balík>+   "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    --resign <balík>+     "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "ověřit podpis balíčku"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "vynechat případné podpisy PGP"
 
-#: rpm.c:528
+#: rpm.c:546
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "vynechat případné podpisy PGP"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "vynechat případné podpisy MD5"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "uvést příznaky, které lze použít v dotazovacím formátu"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "zajistit, aby existovala platná databáze"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "přestavit databázi z existující databáze"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"nastavit oprávnění souborů dle údajů v databázi balíčků pomocí stejných "
+"voleb pro specifikaci balíčku, jako pro -q"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"nastavit vlastníka a skupinu souborů dle údajů v databázi balíčků pomocí "
+"stejných voleb pro specifikaci balíčku, jako pro -q"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "specifikovat lze jen jeden hlavní režim"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u a --uninstall se neschvalují a již je nelze použít.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Místo nich použijte -e nebo --erase.\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "--build (-b) vyžaduje jednu z voleb a,b,i,c,p,l jako svůj výhradní argument"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "--tarbuild (-t) vyžaduje jednu z voleb a,b,i,c,p,l jako svůj výhradní "
 "argument"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "v daném okamžiku lze provést jeden typ dotazu či ověření"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "argumenty pro --dbpath musejí začínat znakem /"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "přemístění musejí začínat znakem /"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "přemístění musejí obsahovat ="
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "přemístění musejí mít za znakem = znak /"
 
-#: rpm.c:897
+#: rpm.c:932
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "přemístění musejí začínat znakem /"
 
-#: rpm.c:906
+#: rpm.c:941
 #, fuzzy, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Interní chyba při zpracování argumentů :-(\n"
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath zadána pro operaci, která databázi nepoužívá"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck lze použít jen při sestavování balíčků"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "nečekaný zdroj dotazu"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "nečekaný zdroj dotazu"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "nečekaný zdroj dotazu"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "vynucena může být jen instalace a aktualizace"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "soubory mohou být přemístěny jen při instalaci balíčků"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "použít lze jen jeden z --prefix nebo --relocate"
 
-#: rpm.c:985
+#: rpm.c:1022
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate se může použít jen při instalaci balíčků"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix se může použít jen při instalaci nových balíčků"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pro --prefix musejí začínat znakem /"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "specifikovat lze jen jeden z --excludedocs a --includedocs"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1030
+#: rpm.c:1067
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches se může specifikovat jen při mazání balíčků"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles se může specifikovat jen při instalaci balíčků"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb se může specifikovat jen při instalaci nebo mazání balíčků"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1155,7 +1178,7 @@ msgstr ""
 "--noscripts se může specifikovat jen při instalaci, mazání nebo verifikaci "
 "balíčků"
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1163,7 +1186,7 @@ msgstr ""
 "--notriggers se může specifikovat jen při instalaci, mazání nebo verifikaci "
 "balíčků"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1172,7 +1195,7 @@ msgstr ""
 "--nodeps se může specifikovat jen při instalaci, mazání nebo verifikaci "
 "balíčků"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1180,7 +1203,7 @@ msgstr ""
 "--test se může specifikovat jen při instalaci, mazání nebo sestavování "
 "balíčků"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1188,127 +1211,127 @@ msgstr ""
 "--root (-r) se může určit jen při instalaci, mazání, dotazování a opětných "
 "sestavování databází"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pro --root (-r) musejí začínat znakem /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage lze použít jen při aktualizacích"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "volby ftp lze použít jen při dotazování, instalacích a aktualizacích balíčků"
 
-#: rpm.c:1093
+#: rpm.c:1131
 #, fuzzy
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "volby ftp lze použít jen při dotazování, instalacích a aktualizacích balíčků"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp lze použít jen při kontrolování podpisů"
 
-#: rpm.c:1100
+#: rpm.c:1139
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp lze použít jen při kontrolování podpisů"
 
-#: rpm.c:1103
+#: rpm.c:1142
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nopgp se může použít jen při kontrolování podpisů a verifikaci balíčků"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "nelze otevřít soubor %s: "
 
-#: rpm.c:1151
+#: rpm.c:1192
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Soubor nebyl na serveru nalezen"
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Chybná heslová fráze\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Heslová fráze je dobrá.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign lze použít jen při sestavování balíčků"
 
-#: rpm.c:1186
+#: rpm.c:1227
 msgid "exec failed\n"
 msgstr "nelze spustit\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "nečekané argumenty pro --querytags "
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "ke kontrole podpisu nezadány žádné balíčky"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "k podpisu nezadány žádné balíčky"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "k opětnému sestavení nezadány žádné soubory balíčků"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "pro sestavení nezadány žádné soubory .spec"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "pro sestavení nezadány žádné soubory tar"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "pro deinstalaci nezadány žádné balíčky"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "pro instalaci nezadány žádné balíčky"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "k dotazu na všechny balíčky zadány argumenty navíc"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "k dotazu nezadány žádné argumenty"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "k dotazu na všechny balíčky zadány argumenty navíc"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "pro verifikaci nezadány žádné argumenty"
 
@@ -3693,6 +3716,21 @@ msgstr "chybí      %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyřešené závislosti pro %s-%s-%s: "
 
+#~ msgid "        --requires"
+#~ msgstr "        --requires"
+
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "přemístit soubory, i když to balíček nedovoluje"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "po dokončení odstranit zdroje a soubor .spec"
+
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    --rmsource <.spec>    "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "odstranit zdroje a soubor .spec"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "žádný balíček nevlastní soubor %s\n"
diff --git a/po/de.po b/po/de.po
index c810b2a6a..8c2948521 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -128,7 +128,7 @@ msgstr "Paket-Betriebssystem nicht überprüfen"
 msgid "override build root"
 msgstr "Benutze <VERZ> als Stammverzeichnis beim Erstellen"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "Erstellungsdateibaum nach Beendigung löschen"
 
@@ -141,7 +141,7 @@ msgstr "Keine Stufen ausführen"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
@@ -151,7 +151,7 @@ msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 msgid "remove specfile when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "Direkt zur angegeben Stufe springen (nur für c und i)"
 
@@ -207,152 +207,153 @@ msgstr "Paket %s in %s nicht gefunden"
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
 # , c-format
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Version %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright Š 1998 - Red Hat Software"
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Dies darf unter den Bedingungen der ťGNU GPLŤ frei verteilt werden"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "Benutzung: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <VERZ>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <VERZ>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <DATEI>] [--ignorearch] [--dbpath <VERZ>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <VERZ>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                        [--ftpproxy <RECHNER>] [--ftpport <PORT>] [--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate <ALTPFAD>=<NEUPFAD>]"
 
-#: rpm.c:235
+#: rpm.c:246
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:236
+#: rpm.c:247
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <VERZ>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <DATEI>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <VERZ>]"
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:245
+#: rpm.c:256
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:246
+#: rpm.c:257
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:261
 #, fuzzy
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 "                        [--ftpuseport] [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:252
+#: rpm.c:263
 #, fuzzy
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
@@ -360,311 +361,345 @@ msgstr ""
 "                        [--dbpath <VERZ>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:253
+#: rpm.c:264
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <VERZ>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [ZIEL]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [ZIEL]"
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <VERZ>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] PAKET1 ... PAKETn"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<DATEI>]"
 
-#: rpm.c:264
+#: rpm.c:275
 #, fuzzy
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 "                        [--sign] [--test] [--timecheck <S>] [--buildos <BS>]"
 
-#: rpm.c:265
+#: rpm.c:276
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [ZIELE]"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--buildarch <ARCH>] [--rmsource] SPEC-DATEI"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "       rpm {--rmsource} [--rcfile <DATAEI>] [-v] SPEC-DATEI"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
-#: rpm.c:272
+#: rpm.c:283
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <DATEI>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           PAKET1 ... PAKETn"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <DATEI>] [--dbpath <VERZ>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "Benutzung:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "Gibt diesen Text aus"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "Die benutzte RPM-Version anzeigen"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   alle Modi unterstützen folgende Argumente:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "<DATEI> anstelle von /etc/rpmrc und $HOME/.rpmrc benutzen"
-
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "Ausgabe etwas ausführlicher gestalten"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "extrem ausführliche Ausgabe (um Programm-Fehler zu finden)"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "Anfrage-Modus"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "Die benutzte RPM-Version anzeigen"
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr ""
+#: rpm.c:332
+#, fuzzy
+msgid "    --pipe <cmd>          "
+msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "<VERZ> als Stammverzeichnis benutzen"
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
+#: rpm.c:334
 #, fuzzy
-msgid "      --dbpath <dir>      "
+msgid "    --rcfile <file>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "<VERZ> als Datenbankverzeichnis benutzen"
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "<DATEI> anstelle von /etc/rpmrc und $HOME/.rpmrc benutzen"
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:328
-#, fuzzy
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "S als Kopfzeilen-Format benutzen (impliziert -i)"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "Ausgabe etwas ausführlicher gestalten"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "extrem ausführliche Ausgabe (um Programm-Fehler zu finden)"
+
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   Installieren, Aktualisieren und Anfragen (mit -p) erlauben es, ftp-URLs"
 
-#: rpm.c:330
+#: rpm.c:345
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr ""
 "   anstelle von Dateinamen zu benutzen. Außerdem die folgenden Optionen:\n"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "Hostname oder IP des ftp-Proxys"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "Portnummer des ftp-Servers (oder -Proxys)"
 
-#: rpm.c:335
+#: rpm.c:350
 #, fuzzy
-msgid "      --httpproxy <host>   "
+msgid "      --httpproxy <host>  "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:336
+#: rpm.c:351
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "Hostname oder IP des ftp-Proxys"
 
-#: rpm.c:337
+#: rpm.c:352
 #, fuzzy
-msgid "      --httpport <port>    "
+msgid "      --httpport <port>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:338
+#: rpm.c:353
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "Portnummer des ftp-Servers (oder -Proxys)"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "Anfrage-Modus"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+#, fuzzy
+msgid "      --dbpath <dir>      "
+msgstr "    -b<STUFE> <SPEC>      "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "<VERZ> als Datenbankverzeichnis benutzen"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr ""
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "S als Kopfzeilen-Format benutzen (impliziert -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr ""
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "<VERZ> als Stammverzeichnis benutzen"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Optionen der Paketauswahl:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "Anfrage an alle Pakete"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "Anfrage nach (nicht installiertem) Paket <PAKET-DATEI>"
 
-#: rpm.c:346
+#: rpm.c:371
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:347
+#: rpm.c:372
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:348
+#: rpm.c:373
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:349
+#: rpm.c:374
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
 
-#: rpm.c:350
+#: rpm.c:375
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:351
+#: rpm.c:376
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Optionen der Informationsauswahl:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "Paketinformationen anzeigen"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "Changelog des Pakets anzeigen"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "Dateiliste des Pakets anzeigen"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "Status der Dateien anzeigen (impliziert -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "Nur Dokumentationsdateien auflisten (impliziert -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -672,198 +707,172 @@ msgstr ""
 "Alle überprüfbaren Infos zu jeder Datei anzeigen (mit -l, -c oder -d "
 "benutzen!)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "Fähigkeiten des Pakets auflisten"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr ""
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "Paket-Abhängigkeiten ausgeben"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "Die diversen (De-)Installations-Skripte ausgeben"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:379
-#, fuzzy
-msgid "    --pipe <cmd>          "
-msgstr "    -b<STUFE> <SPEC>      "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 "Ein Paket mit denselben Paketspezifikations-Optionen wie bei -q überprüfen"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "Dateiabhängigkeiten nicht überprüfen"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "md5-Prüfsumme der Datei nicht überprüfen"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "Dateiattribute nicht überprüfen"
 
-# Was ist gemeint?
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"Dateirechte gemäß deren in der Paketdatenbank setzen, wie wenn dieselben "
-"Paketspezifikationsoptionen wie bei -q benutzt würden"
-
-# Was ist gemeint?
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"Datei-Eigentümer und -Gruppe gemäß deren in der Paketdatenbank setzen, wie "
-"wenn dieselben Paketspezifikationsoptionen wie bei -q benutzt würden"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "Tags auflisten, die im Anfrageformat benutzt werden können"
 
-#: rpm.c:402
+#: rpm.c:418
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "Paket installieren"
 
-#: rpm.c:403
+#: rpm.c:419
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "Paket installieren"
 
-#: rpm.c:405
+#: rpm.c:421
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:407
+#: rpm.c:423
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "verschiebe Dateien, obglich das Paket es nicht erlaubt"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "Paket %s ist nicht installiert\n"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "Dokumentation nicht installieren"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "Abkürzung für --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Fortschrittsanzeige bei der Paketinstallation (gut zusammen mit -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "alle Dateien installieren, auch die config-Dateien, die sonst übergangen "
 "würden"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "Paket-Betriebssystem nicht überprüfen"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "Dokumentation installieren"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "Datenbank erneuern, aber das Dateisystem nicht verändern"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "Prozentangabe bei der Paketinstallation ausgeben"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:471
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "Paket aktualisieren (dieselben Optionen wie --install, außerdem)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -871,15 +880,15 @@ msgstr ""
 "Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
 "Aktualisierungen automatisch)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "Paket löschen (deinstallieren)"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -887,97 +896,98 @@ msgstr ""
 "Alle Pakete entfernen, die mit <PAKET> übereinstimmen (normalerweise wird "
 "ein Fehler angezeigt, wenn <PAKET> mehrere Pakete bezeichnet)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "Keine paketspezifischen Skripte ausführen"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:481
+#: rpm.c:497
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "Paket erstellen, <STUFE> ist einer der Buchstaben:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "präparieren (Quellen entpacken und Patch-Dateien anwenden"
 
 # , c-format
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrollieren (oberflächliche Überprüfung der %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "kompilieren (präparieren und kompilieren)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "installieren (präparieren, kompilieren, installieren)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 "Binärpaket erstellen (präparieren, kompilieren, installieren und paketieren)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "Binär- und Quellpaket erstellen (präparieren, kompilieren, installieren und "
 "Paketieren"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 
-#: rpm.c:502
+#: rpm.c:520
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP-Signatur generieren"
 
-#: rpm.c:503
+#: rpm.c:521
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "Benutze <VERZ> als Stammverzeichnis beim Erstellen"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "Keine Stufen ausführen"
 
-#: rpm.c:509
+#: rpm.c:527
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:510
+#: rpm.c:528
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "Die Zeitüberprüfung auf S Sekunden setzen (mit 0 ausschalten)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -985,238 +995,248 @@ msgstr ""
 "Quellpaket installieren, Binarypaket erstellen und spec-Datei, Quellen, "
 "Patch-Dateien und Icons löschen"
 
-#: rpm.c:514
-#, fuzzy
-msgid "    --rmsource <spec>     "
-msgstr "    -b<STUFE> <SPEC>      "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "lösche Quellen und spec-Datei"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "wie --rebuild aber kein Paket erstellen"
 
-#: rpm.c:518
+#: rpm.c:536
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
-#: rpm.c:520
+#: rpm.c:538
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "Signatur einem Paket hinzufügen"
 
-#: rpm.c:523
+#: rpm.c:540
 #, fuzzy
-msgid "    --checksig <pkg>+     "
+msgid "    --checksig <pkg>+"
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    -b<STUFE> <SPEC>      "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "Paketsignatur überprüfen"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "alle PGP-Signaturen überspringen"
 
-#: rpm.c:528
+#: rpm.c:546
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "alle PGP-Signaturen überspringen"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "alle MD5-Signaturen überspringen"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "Tags auflisten, die im Anfrageformat benutzt werden können"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "Sicherstellen, daß eine gültige Datenbank vorhanden ist"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+# Was ist gemeint?
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"Dateirechte gemäß deren in der Paketdatenbank setzen, wie wenn dieselben "
+"Paketspezifikationsoptionen wie bei -q benutzt würden"
+
+# Was ist gemeint?
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"Datei-Eigentümer und -Gruppe gemäß deren in der Paketdatenbank setzen, wie "
+"wenn dieselben Paketspezifikationsoptionen wie bei -q benutzt würden"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "Es darf nur ein Hauptmodus angegeben werden"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u und --uninstall sind veraltet und funktionieren nicht mehr.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Benutzen Sie stattdessen -e oder --erase\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "--build (-b) benötigt einen Buchstaben aus a,b,i,c,p,l als einziges Argument"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "--tarbuild (-t) benötigt einen Buchstaben aus a,b,i,c,p,l als einziges "
 "Argument"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 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"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "Argumente zu --dbpath müssen mit einem / beginnen"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "Verschiebungen müssen ein ť=Ť beinhalten"
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "bei Verschiebungen muss ein ť/Ť dem ť=Ť folgen"
 
-#: rpm.c:897
+#: rpm.c:932
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath wurde für eine Operation angeben, die keine Datenbank benutzt"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--clean darf nur während der Paketerstellung benutzt werden"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "Dateien können nur während der Paketinstallation verschoben werden"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
 
-#: rpm.c:985
+#: rpm.c:1022
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "Argumente zu --prefix müssen mit einem / beginnen"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1030
+#: rpm.c:1067
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1224,7 +1244,7 @@ msgstr ""
 "--noscripts darf nur während der Paketinstallation, -deinstallation und "
 "-überprüfung angegeben werden"
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1232,7 +1252,7 @@ msgstr ""
 "--notriggers darf nur während der Paketinstallation, -deinstallation und "
 "-überprüfung angegeben werden"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1241,7 +1261,7 @@ msgstr ""
 "--nodeps darf nur während der Paketinstallation, -deinstallation und "
 "-überprüfung angegeben werden"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1249,7 +1269,7 @@ msgstr ""
 "--test darf nur während der Paketinstallation, -deinstallation und "
 "-erstellung angegeben werden"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1257,22 +1277,22 @@ msgstr ""
 "--root (-r) darf nur während der Paketinstallation, -deinstallation, "
 "-anfrage und Datenbankneuerstellungen angegeben werden"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage darf nur während Aktualisierungen benutzt werden"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "ftp-Optionen können nur während Paketanfragen, -installationen und "
 "-aktualisierungen benutzt werden"
 
-#: rpm.c:1093
+#: rpm.c:1131
 #, fuzzy
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
@@ -1280,107 +1300,107 @@ msgstr ""
 "ftp-Optionen können nur während Paketanfragen, -installationen und "
 "-aktualisierungen benutzt werden"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
 
-#: rpm.c:1100
+#: rpm.c:1139
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
 
-#: rpm.c:1103
+#: rpm.c:1142
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nopgp darf nur während der Signatur- und Paketüberprüfung angegeben werden"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpm.c:1151
+#: rpm.c:1192
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Das Passwort ist richtig.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign darf nur während der Paketerstellung benutzt werden"
 
-#: rpm.c:1186
+#: rpm.c:1227
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "Unerwartete Argumente zu --querytags "
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "Es wurden keine Pakete für die Signaturüberprüfung angegeben"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "Es wurden keine Pakete für die Signatur angeben"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
 
@@ -3828,6 +3848,19 @@ msgstr "fehlende { nach %{"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
 
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "verschiebe Dateien, obglich das Paket es nicht erlaubt"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "Quellen und spec-Dateien nach Beendigung löschen"
+
+#, fuzzy
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "lösche Quellen und spec-Datei"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
diff --git a/po/fi.po b/po/fi.po
index db4fd05e0..6a311b201 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -99,7 +99,7 @@ msgstr "älä tarkista paketin käyttöjärjestelmää"
 msgid "override build root"
 msgstr "käytä <hakem> käännöspuun juurena"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "poista käännöspuu, kun valmis"
 
@@ -112,7 +112,7 @@ msgstr "älä suorita mitään vaiheita"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
@@ -122,7 +122,7 @@ msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 msgid "remove specfile when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "siirry suoraan määriteltyyn vaiheeseen (vain c ja i yhteydessä)"
 
@@ -178,145 +178,146 @@ msgstr "paketti %s ei ole %s:ssä"
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versio %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "käyttö: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <hakem>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <hakem>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <tiedosto>] [--ignorearch] [--dbpath "
 "<hakem>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <hakem>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                        [--ftpproxy <kone>] [--ftpport <portti>] [--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <kone>] [--ftpport <portti>]"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate vanhapolku=uusipolku]"
 
-#: rpm.c:235
+#: rpm.c:246
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:236
+#: rpm.c:247
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <hakem>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <tiedosto>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <hakem>] [--prefix "
 "<hakem>] "
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <kone>] [--ftpport <portti>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:256
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:246
+#: rpm.c:257
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:261
 #, fuzzy
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
@@ -324,7 +325,7 @@ msgstr ""
 "                        [--ftpuseport] [--ftpproxy <kone>] [--ftpport "
 "<portti>]"
 
-#: rpm.c:252
+#: rpm.c:263
 #, fuzzy
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
@@ -332,318 +333,352 @@ msgstr ""
 "                        [--dbpath <hakem>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:253
+#: rpm.c:264
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <hakem>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [kohde]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [kohde]"
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <hakem>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 #, fuzzy
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "                        [--justdb] paketti1 ... pakettiN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<tiedosto>]"
 
-#: rpm.c:264
+#: rpm.c:275
 #, fuzzy
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 "                        [--sign] [--test] [--timecheck <s>] [--buildos <kj>]"
 
-#: rpm.c:265
+#: rpm.c:276
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [kohteet]"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 "                        [--buildarch <arkk>] [--rmsource] määrittelytiedosto"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
 "lähdekoodiN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
 "lähdekoodiN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--resign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
-#: rpm.c:272
+#: rpm.c:283
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <tiedosto>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           paketti1 ... pakettiN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <tiedosto>] [--dbpath <hakem>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "käyttö:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "tulosta tämä viesti"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   kaikki moodit tukevat seuraavia parametrejä"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "käytä <tiedosto> eikä /etc/rpmrc tai $HOME/.rpmrc"
-
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "tulosta enemmän viestejä"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "tulosta mahdollisimman paljon viestejä (vianetsintään)"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "kyselymoodi"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "tulosta käytetyn rpm:n versio"
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr ""
+#: rpm.c:332
+#, fuzzy
+msgid "    --pipe <cmd>          "
+msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "käytä <hakem> ylimpänä hakemistona"
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "lähetä vakiotuloste <komento>:lle"
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
+#: rpm.c:334
 #, fuzzy
-msgid "      --dbpath <dir>      "
+msgid "    --rcfile <file>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "kaytä <hakem> tietokannan hakemistona"
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "käytä <tiedosto> eikä /etc/rpmrc tai $HOME/.rpmrc"
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:328
-#, fuzzy
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "käytä s headerin formaatina (josta seuraa -i)"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "tulosta enemmän viestejä"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "tulosta mahdollisimman paljon viestejä (vianetsintään)"
+
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa)  ftp URL:ja "
 "voidaan käyttää"
 
-#: rpm.c:330
+#: rpm.c:345
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr "   tiedostoniminä, kuten myös seuraavia parametrejä:\n"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "koneen nimi tai IP tai ftp-proxy"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "ftp-palvelijan (tai proxyn) porttinumero"
 
-#: rpm.c:335
+#: rpm.c:350
 #, fuzzy
-msgid "      --httpproxy <host>   "
+msgid "      --httpproxy <host>  "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:336
+#: rpm.c:351
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "koneen nimi tai IP tai ftp-proxy"
 
-#: rpm.c:337
+#: rpm.c:352
 #, fuzzy
-msgid "      --httpport <port>    "
+msgid "      --httpport <port>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:338
+#: rpm.c:353
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "ftp-palvelijan (tai proxyn) porttinumero"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "kyselymoodi"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+#, fuzzy
+msgid "      --dbpath <dir>      "
+msgstr "    -b<vaihe> <määrittely> "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "kaytä <hakem> tietokannan hakemistona"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr ""
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "käytä s headerin formaatina (josta seuraa -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr ""
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "käytä <hakem> ylimpänä hakemistona"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Paketin määrittelyparametrit:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "kysele kaikki paketit"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "kysele(asentamatonta) pakettia <pakettitiedosto>"
 
-#: rpm.c:346
+#: rpm.c:371
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:347
+#: rpm.c:372
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:348
+#: rpm.c:373
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:349
+#: rpm.c:374
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
 
-#: rpm.c:350
+#: rpm.c:375
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:351
+#: rpm.c:376
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Tietojen valintaparametrit:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "näytä paketin tiedot"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "näytä paketin muutosloki"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "näytä paketin tiedostolistaus"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "näytä tiedostojen tilat (josta seuraa -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "listaa vain dokumettitiedostot (josta seuraa -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -651,36 +686,23 @@ msgstr ""
 "näytä kaikki varmistettavissa oleva tieto kustakin tiedostosta (pitää "
 "käyttää -l, -c, tai -d kanssa)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "luettele paketin tarjoamat ominaisuudet"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr ""
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "listaa paketin riippuvuudet"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "tulosta erinäiset asennus/poisto-skriptit"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:379
-#, fuzzy
-msgid "    --pipe <cmd>          "
-msgstr "    -b<vaihe> <määrittely> "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "lähetä vakiotuloste <komento>:lle"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -688,157 +710,146 @@ msgstr ""
 "tarkista paketin asennus käyttäen samoja paketin määrittelyparametrejä kuin "
 "-q "
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "älä tarkista tiedostojen md5-tarkistussummia"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "älä tarkista tiedostojen ominaisuuksia"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"aseta tiedostojen oikeudet niiksi, jotka ne ovat pakettien tietokannassa "
-"käyttäen samoja pakettien määrittelyparametrejä kuin -q"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"aseta tiedostojen omistaja ja ryhmä niiksi, jotka ne ovat pakettien "
-"tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "luettele nimiöt, joita voidaan käyttää kyselyn formaatissa"
 
-#: rpm.c:402
+#: rpm.c:418
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "asenna paketti"
 
-#: rpm.c:403
+#: rpm.c:419
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "asenna paketti"
 
-#: rpm.c:405
+#: rpm.c:421
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:407
+#: rpm.c:423
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "siirrä tiedostot toiseen hakemistoon vaikka paketti ei sitä sallisi"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "paketti %s ei ole asennettu\n"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "älä asenna dokumentointia"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "lyhenne parametreille --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "älä tarkista paketin käyttöjärjestelmää"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "asenna dokumentaatio"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "älä suorita asennusskriptejä"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "tulosta asennuksen eteneminen prosentteina"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "asenna uudelleen, jos paketti on jo asennettu"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "älä asenna, mutta kerro onnistuisiko se"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:471
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "päivitä paketti (samat parametrit kuin --install, plus)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -846,15 +857,15 @@ msgstr ""
 "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
 "automaattisesti)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "poista paketti"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -862,93 +873,94 @@ msgstr ""
 "poista kaikki paketit, joiden nimeä vastaa  <paketti> (tavallisesti, jos  "
 "<paketti> määrittää useita paketteja, tulee virhe)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "älä aja mitään pakettikohtaisia skriptejä"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:481
+#: rpm.c:497
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "tee paketti, jossa <vaihe> on jokin:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "valmistele (pura lähdekoodi ja tee korjaukset)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "listatarkistus (tee joitakin tarkistuksia %tiedostoihin)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "käännä (valmistele ja käännä)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "asenna (valmistele, käännä ja asenna)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "binääripaketti (valmistele, käännä, asenna, paketoi)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src-paketti (valmistele, käännä, asenna, paketoi)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 
-#: rpm.c:502
+#: rpm.c:520
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "generoi PGP-allekirjoitus"
 
-#: rpm.c:503
+#: rpm.c:521
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "käytä <hakem> käännöspuun juurena"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "älä suorita mitään vaiheita"
 
-#: rpm.c:509
+#: rpm.c:527
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:510
+#: rpm.c:528
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "aseta aikatarkistus S sekunniksi (0 ohittaa)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -956,232 +968,240 @@ msgstr ""
 "asenna lähdekoodipaketti, käännä binääripaketti ja poista "
 "määrittelytiedosto, lähdekoodi, korjaukset ja kuvakkeet"
 
-#: rpm.c:514
-#, fuzzy
-msgid "    --rmsource <spec>     "
-msgstr "    -b<vaihe> <määrittely> "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "poista lähdekoodi ja määrittelytiedosto"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "kuten --rebuild, mutta ei käännä paketteja"
 
-#: rpm.c:518
+#: rpm.c:536
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: rpm.c:520
+#: rpm.c:538
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "lisää allekirjoitus pakettiin"
 
-#: rpm.c:523
+#: rpm.c:540
 #, fuzzy
-msgid "    --checksig <pkg>+     "
+msgid "    --checksig <pkg>+"
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    -b<vaihe> <määrittely> "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "tarkista paketin allekirjoitus"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "ohita PGP-allekirjoitukset"
 
-#: rpm.c:528
+#: rpm.c:546
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "ohita PGP-allekirjoitukset"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "ohita MD5-allekirjoitukset"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "luettele nimiöt, joita voidaan käyttää kyselyn formaatissa"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "tarkista, että kunnollinen tietokanta löytyy"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"aseta tiedostojen oikeudet niiksi, jotka ne ovat pakettien tietokannassa "
+"käyttäen samoja pakettien määrittelyparametrejä kuin -q"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"aseta tiedostojen omistaja ja ryhmä niiksi, jotka ne ovat pakettien "
+"tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "vain yksi päämoodi voidaan määritellä"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ja --uninstall ovat vanhentuneet eivätkä enää toimi.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Käytä sen sijaan -e tai --erase .\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) vaatii yhden joukosta a,b,i,c,p,l ainoana parametrinään"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "--tarbuild (-t) vaatii yhden joukosta a,b,i,c,p,l ainoana parametrinään"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "--dbpath:n parametrien pitää alkaa /-merkillä"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "siirroissa pitää olla =-merkki"
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "siirroissa pitää olla / =-merkin jälkeen"
 
-#: rpm.c:897
+#: rpm.c:932
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck parametriä voidaan käyttää vain paketteja koottaessa"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "vain asennus tai päivitys voidaan pakottaa"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "vain toinen --prefix tai --relocate voidaan antaa"
 
-#: rpm.c:985
+#: rpm.c:1022
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix parametrien pitää alkaa /-merkillä"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1030
+#: rpm.c:1067
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1189,7 +1209,7 @@ msgstr ""
 "--noscripts: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpm.c:1051
+#: rpm.c:1088
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1198,7 +1218,7 @@ msgstr ""
 "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1207,7 +1227,7 @@ msgstr ""
 "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1215,7 +1235,7 @@ msgstr ""
 "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
 "käännettäessä"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1223,22 +1243,22 @@ msgstr ""
 "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
 "kyseltäessä ja tietokannan uudelleenluonnissa"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametrit --root (-r):lle alettava /-merkillä"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage: voidaan käyttää vain paketteja päivitettäessä"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "ftp-parametrejä voidaan käyttää vain paketteja kysellessä, asennettaessa ja "
 "päivitettäessä"
 
-#: rpm.c:1093
+#: rpm.c:1131
 #, fuzzy
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
@@ -1246,16 +1266,16 @@ msgstr ""
 "ftp-parametrejä voidaan käyttää vain paketteja kysellessä, asennettaessa ja "
 "päivitettäessä"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
 
-#: rpm.c:1100
+#: rpm.c:1139
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
 
-#: rpm.c:1103
+#: rpm.c:1142
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
@@ -1263,91 +1283,91 @@ msgstr ""
 "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa ja paketteja "
 "todennettaessa"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpm.c:1151
+#: rpm.c:1192
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
 
-#: rpm.c:1186
+#: rpm.c:1227
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags: odottamattomia parametrejä"
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "allekirjoituksen tarkistukselle ei määritelty paketteja"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "allekirjoitukselle ei määritelty paketteja"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "uudelleenkäännolle ei määritelty paketteja"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "käännökselle ei annettu määrittelytiedostoja"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "käännökselle ei määritelty tar-tiedostoja"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "poistolle ei määritelty paketteja"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrejä"
 
@@ -3737,6 +3757,19 @@ msgstr "puuttuva '{' '%':n jälkeen"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
 
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "siirrä tiedostot toiseen hakemistoon vaikka paketti ei sitä sallisi"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
+
+#, fuzzy
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "poista lähdekoodi ja määrittelytiedosto"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "tiedostoa %s ei omista mikään paketti\n"
diff --git a/po/fr.po b/po/fr.po
index fc01b5c19..d8b4d3bb0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-05-17 12:19-0400\n"
+msgstr "POT-Creation-Date: 2000-05-24 13:46-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -78,7 +78,7 @@ msgstr ""
 msgid "override build root"
 msgstr ""
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 #, fuzzy
 msgid "remove build tree when done"
 msgstr "      --clean           - efface l'arborescence aprčs construction"
@@ -91,7 +91,7 @@ msgstr ""
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "      --clean           - efface l'arborescence aprčs construction"
@@ -101,7 +101,7 @@ msgstr "      --clean           - efface l'arborescence aprčs construction"
 msgid "remove specfile when done"
 msgstr "      --clean           - efface l'arborescence aprčs construction"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 #, fuzzy
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
@@ -159,190 +159,190 @@ msgstr "aucun package n'a été spécifié pour la désinstallation"
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Peut ętre redistribué librement selon les termes de la GNU GPL"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:228
+#: rpm.c:239
 #, fuzzy
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:235
+#: rpm.c:246
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:236
+#: rpm.c:247
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:238
+#: rpm.c:249
 #, fuzzy
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "        -i                - affiche les informations relatives ŕ un package"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:241
+#: rpm.c:252
 #, fuzzy
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:256
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:246
+#: rpm.c:257
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:264
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:256
+#: rpm.c:267
 #, fuzzy
 msgid "                        [--nomd5] [targets]"
 msgstr "    -q                  - mode interrogation"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:261
+#: rpm.c:272
 #, fuzzy
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:262
+#: rpm.c:273
 #, fuzzy
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
@@ -350,468 +350,480 @@ msgstr ""
 "                        - installe le package source, construit le package "
 "binaire,"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: rpm.c:264
+#: rpm.c:275
 #, fuzzy
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:265
+#: rpm.c:276
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 "        -i                - affiche les informations relatives ŕ un package"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:272
+#: rpm.c:283
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:273
+#: rpm.c:284
 #, fuzzy
 msgid "                           package1 ... packageN"
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+msgid "Usage:"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:322
 #, fuzzy
 msgid "print this message"
 msgstr "   --help\t\t- affiche ce message"
 
-#: rpm.c:313
+#: rpm.c:324
 #, fuzzy
 msgid "print the version of rpm being used"
 msgstr "   --version\t\t- affiche la version de rpm utilisée"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr ""
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr ""
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "   --version\t\t- affiche la version de rpm utilisée"
 
-#: rpm.c:322
-msgid "query mode"
-msgstr ""
+#: rpm.c:332
+#, fuzzy
+msgid "    --pipe <cmd>          "
+msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
+#: rpm.c:333
+msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
+#: rpm.c:334
 #, fuzzy
-msgid "use <dir> as the top level directory"
-msgstr "      --root <dir>\t- utilise <dir> comme répertoire racine"
+msgid "    --rcfile <file>       "
+msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
+#: rpm.c:339
+msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:344
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:335
-msgid "      --httpproxy <host>   "
-msgstr ""
+#: rpm.c:350
+#, fuzzy
+msgid "      --httpproxy <host>  "
+msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:336
+#: rpm.c:351
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:352
 #, fuzzy
-msgid "      --httpport <port>    "
+msgid "      --httpport <port>   "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:338
+#: rpm.c:353
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr ""
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr ""
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr ""
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr ""
+
+#: rpm.c:361
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr ""
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr ""
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+#, fuzzy
+msgid "use <dir> as the top level directory"
+msgstr "      --root <dir>\t- utilise <dir> comme répertoire racine"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Options de spécification de package:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:368
 #, fuzzy
 msgid "query package owning <file>"
 msgstr ""
 "        -f <file>+        - interroge le package ŕ qui appartient <file>"
 
-#: rpm.c:344
+#: rpm.c:369
 #, fuzzy
 msgid "        -p <packagefile>+ "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:345
+#: rpm.c:370
 #, fuzzy
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:347
+#: rpm.c:372
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr ""
 "        -f <file>+        - interroge le package ŕ qui appartient <file>"
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Options de sélection d'information:"
 
-#: rpm.c:354
+#: rpm.c:379
 #, fuzzy
 msgid "display package information"
 msgstr ""
 "        -i                - affiche les informations relatives ŕ un package"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:358
+#: rpm.c:383
 #, fuzzy
 msgid "display package file list"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:360
+#: rpm.c:385
 #, fuzzy
 msgid "show file states (implies -l)"
 msgstr "        -s                - montre l'état des fichiers (implique -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 #, fuzzy
 msgid "list only documentation files (implies -l)"
 msgstr ""
 "        -d                - donne uniquement la liste des fichiers de "
 "documentation (implique -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 #, fuzzy
 msgid "list only configuration files (implies -l)"
 msgstr ""
 "        -c                - donne uniquement la liste des fichiers de "
 "configuration (implique -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr ""
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:379
-#, fuzzy
-msgid "    --pipe <cmd>          "
-msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpm.c:382
+#: rpm.c:403
 #, fuzzy
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "\t\t\t  męmes options de spécification de package qu'avec -q"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:402
+#: rpm.c:418
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpm.c:403
+#: rpm.c:419
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr ""
 
-#: rpm.c:405
+#: rpm.c:421
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr ""
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:418
+#: rpm.c:434
 #, fuzzy
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 #, fuzzy
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "      --hash            - affiche des '#' pendant l'installation du package "
 "(utile avec -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:444
+#: rpm.c:459
 #, fuzzy
 msgid "print percentages as package installs"
 msgstr ""
 "      --percent         - affiche des '%' pendant l'installation du package"
 
-#: rpm.c:446
+#: rpm.c:461
 #, fuzzy
 msgid "install even if the package replaces installed files"
 msgstr ""
 "      --replacefiles    - installe męme si le package remplace des fichiers "
 "déjŕ présents"
 
-#: rpm.c:448
+#: rpm.c:463
 #, fuzzy
 msgid "reinstall if the package is already present"
 msgstr "      --replacepkgs      - réinstalle si le package est déjŕ présent"
 
-#: rpm.c:452
+#: rpm.c:467
 #, fuzzy
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 "      --test            - n'installe pas, mais indique si ca fonctionnerait "
 "ou pas"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:471
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:456
+#: rpm.c:472
 #, fuzzy
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 "    -U <packagefile>\t- mise ŕ jour du package (męmes options que --install, "
 "plus)"
 
-#: rpm.c:458
+#: rpm.c:474
 #, fuzzy
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
@@ -820,113 +832,114 @@ msgstr ""
 "      --oldpackage      - mise ŕ jour par une ancienne version du package "
 "(--force"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:482
+#: rpm.c:498
 #, fuzzy
 msgid "build package, where <stage> is one of:"
 msgstr "    -b<stage> <spec>    - construit le package, <stage> peut valoir:"
 
-#: rpm.c:484
+#: rpm.c:500
 #, fuzzy
 msgid "prep (unpack sources and apply patches)"
 msgstr "\t\t\t  p - prépare (extrait le source et applique les patches)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, fuzzy, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "\t\t\t  l - liste vérif (effectue quelques vérifications sur %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 #, fuzzy
 msgid "compile (prep and compile)"
 msgstr "\t\t\t  c - compile (prépare et compile)"
 
-#: rpm.c:490
+#: rpm.c:506
 #, fuzzy
 msgid "install (prep, compile, install)"
 msgstr "\t\t\t  i - installe (prépare, compile, installe)"
 
-#: rpm.c:492
+#: rpm.c:508
 #, fuzzy
 msgid "binary package (prep, compile, install, package)"
 msgstr "\t\t\t  b - package binaire (prépare, compile, installe, package)"
 
-#: rpm.c:494
+#: rpm.c:510
 #, fuzzy
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "\t\t\t  a - package bin/src (prépare, compile, installe, package)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
-msgstr ""
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
+msgstr "      --clean           - efface l'arborescence aprčs construction"
 
-#: rpm.c:502
+#: rpm.c:520
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "      --sign            - genčre une signature PGP"
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:509
+#: rpm.c:527
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:510
+#: rpm.c:528
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 "      --time-check <s>  - positionne l'intervalle de vérification ŕ S "
 "secondes (0 le désactive)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:513
+#: rpm.c:531
 #, fuzzy
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
@@ -935,260 +948,264 @@ msgstr ""
 "                          et efface le fichier spec, les sources, les "
 "patches, et les icones."
 
-#: rpm.c:514
-#, fuzzy
-msgid "    --rmsource <spec>     "
-msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr ""
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:518
+#: rpm.c:536
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:523
+#: rpm.c:540
 #, fuzzy
-msgid "    --checksig <pkg>+     "
+msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:528
+#: rpm.c:546
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "      --sign            - genčre une signature PGP"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr ""
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "un seul mode majeur peut ętre spécifié"
 
-#: rpm.c:710
+#: rpm.c:740
 #, fuzzy
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u et --uninstall sont obsolčtes et seront bientôt supprimés.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Utilisez de préférence -e ou --erase.\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) requiert comme seul argument l'un parmi a,b,i,c,p,l"
 
-#: rpm.c:732
+#: rpm.c:762
 #, fuzzy
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) requiert comme seul argument l'un parmi a,b,i,c,p,l"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "un seul type de requęte/vérification peut ętre effectué ŕ la fois"
 
-#: rpm.c:841
+#: rpm.c:872
 #, fuzzy
 msgid "arguments to --dbpath must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:883
+#: rpm.c:918
 #, fuzzy
 msgid "relocations must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:897
+#: rpm.c:932
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpm.c:961
+#: rpm.c:997
 #, fuzzy
 msgid "--timecheck may only be used during package builds"
 msgstr "--clean ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "source de requęte inattendue"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "source de requęte inattendue"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "source de requęte inattendue"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "seules l'installation et la mise ŕ jour peuvent ętre forcées"
 
-#: rpm.c:979
+#: rpm.c:1016
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr ""
 "--replacefiles ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:982
+#: rpm.c:1019
 #, fuzzy
 msgid "only one of --prefix or --relocate may be used"
 msgstr "un seul mode majeur peut ętre spécifié"
 
-#: rpm.c:985
+#: rpm.c:1022
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--clean ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:988
+#: rpm.c:1025
 #, fuzzy
 msgid "--prefix may only be used when installing new packages"
 msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:991
+#: rpm.c:1028
 #, fuzzy
 msgid "arguments to --prefix must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "--percent ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1010
+#: rpm.c:1047
 #, fuzzy
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--percent ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1014
+#: rpm.c:1051
 #, fuzzy
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--percent ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1018
+#: rpm.c:1055
 #, fuzzy
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "un seul mode majeur peut ętre spécifié"
 
-#: rpm.c:1022
+#: rpm.c:1059
 #, fuzzy
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--percent ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1026
+#: rpm.c:1063
 #, fuzzy
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--percent ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1030
+#: rpm.c:1067
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--percent ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1034
+#: rpm.c:1071
 #, fuzzy
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--replacepkgs ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1038
+#: rpm.c:1075
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut ętre spécifié que lors de l'installation d'un package"
 
-#: rpm.c:1042
+#: rpm.c:1079
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:1047
+#: rpm.c:1084
 #, fuzzy
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
@@ -1197,7 +1214,7 @@ msgstr ""
 "--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:1051
+#: rpm.c:1088
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1206,7 +1223,7 @@ msgstr ""
 "--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1215,7 +1232,7 @@ msgstr ""
 "--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:1060
+#: rpm.c:1097
 #, fuzzy
 msgid ""
 "--test may only be specified during package installation, erasure, and "
@@ -1224,7 +1241,7 @@ msgstr ""
 "--test ne peut ętre spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:1064
+#: rpm.c:1101
 #, fuzzy
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
@@ -1233,130 +1250,130 @@ msgstr ""
 "--root (-r) ne peut ętre spécifié que lors de l'installation, de la "
 "désinstallation ou de l'interrogation d'un package"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage ne peut ętre spécifié que lors de mises ŕ jour"
 
-#: rpm.c:1087
+#: rpm.c:1125
 #, fuzzy
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:1093
+#: rpm.c:1131
 #, fuzzy
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:1097
+#: rpm.c:1136
 #, fuzzy
 msgid "--nopgp may only be used during signature checking"
 msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:1100
+#: rpm.c:1139
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:1103
+#: rpm.c:1142
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:1151
+#: rpm.c:1192
 #, fuzzy
 msgid "pgp not found: "
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "La vérification du mot de passe a échoué\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Mot de passe correct.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign ne peut ętre spécifié que lors de la construction d'un package"
 
-#: rpm.c:1186
+#: rpm.c:1227
 #, fuzzy
 msgid "exec failed\n"
 msgstr "La construction a échoué.\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "aucun package n'a été spécifié pour la vérification de signature"
 
-#: rpm.c:1227
+#: rpm.c:1268
 #, fuzzy
 msgid "no packages given for signing"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "aucun package n'a été spécifié pour la reconstruction"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "aucun package n'a été spécifié pour la construction"
 
-#: rpm.c:1304
+#: rpm.c:1345
 #, fuzzy
 msgid "no tar files given for build"
 msgstr "aucun package n'a été spécifié pour la construction"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: rpm.c:1393
+#: rpm.c:1434
 #, fuzzy
 msgid "extra arguments given for query of all packages"
 msgstr "aucun argument n'a été fourni pour la requęte"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "aucun argument n'a été fourni pour la requęte"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "aucun argument n'a été fourni pour la requęte"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "aucun argument n'a été fourni pour la vérification"
 
@@ -3723,6 +3740,10 @@ msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
 #, fuzzy
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
+
+#, fuzzy
 #~ msgid "key \"%s\" not found in %s"
 #~ msgstr "aucun package n'a été spécifié pour la désinstallation"
 
diff --git a/po/ja.po b/po/ja.po
index 9b97a2692..906d0d153 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -97,7 +97,7 @@ msgstr "şîŔŽÂĐžÝOS¤ňžĺ˝ń¤­¤ˇ¤Ţ¤š"
 msgid "override build root"
 msgstr "ĽÓĽëĽÉĽëĄźĽČ¤ňžĺ˝ń¤­¤ˇ¤Ţ¤š"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽóĽ°¸ĺşîŔŽĽÄĽęĄź¤ňşď˝ü¤ˇ¤Ţ¤š"
 
@@ -110,7 +110,7 @@ msgstr "şîŔŽ¤š¤ë¤ż¤á¤Î¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤Ť¤é I18N ¤Ę msgstr ¤ňźő¤ąĆţ¤ě¤Ţ¤ť¤ó"
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "˝ŞÎť¸ĺĽ˝ĄźĽš¤ňşď˝ü¤ˇ¤Ţ¤š"
@@ -120,7 +120,7 @@ msgstr "˝ŞÎť¸ĺĽ˝ĄźĽš¤ňşď˝ü¤ˇ¤Ţ¤š"
 msgid "remove specfile when done"
 msgstr "˝ŞÎť¸ĺĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤ňşď˝ü¤ˇ¤Ţ¤š"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "ťŘÄꤡ¤ż˛áÄř¤Ţ¤ÇĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š (cĄ˘i ¤Ç¤Î¤ßÍ­¸ú)"
 
@@ -193,428 +193,461 @@ msgstr "copyright ¤Ź¤˘¤ę¤Ţ¤ť¤ó!\n"
 # build root [BuildRoot]
 # net share [ĽÍĽĂĽČśŚÍ­]
 # reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.57 2000/05/18 13:00:53 jbj Exp $
-#: rpm.c:200
+# $Id: ja.po,v 1.58 2000/05/24 17:53:36 jbj Exp $
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ĽĐĄźĽ¸ĽçĽó %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 "Ăřşî¸˘ (C) 1998 - Red Hat Software\n"
 "ËÝĚőźÔ żŔĹÄ ˝ź <kanda@nn.iij4u.or.jp>\n"
 "¸íĚőĹů¤ĎżŔĹĤޤÇ"
 
-#: rpm.c:216
+#: rpm.c:227
 #, fuzzy
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "GNU°ěČ̸řÍ­ťČÍŃľöÂú˝ń¤Î˛ź¤ÇźŤÍł¤ËÇŰÉۤǤ­¤Ţ¤š"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "ťČÍŃËĄ: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:235
+#: rpm.c:246
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:236
+#: rpm.c:247
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:256
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:246
+#: rpm.c:257
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:264
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:259
+#: rpm.c:270
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: rpm.c:264
+#: rpm.c:275
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 
-#: rpm.c:265
+#: rpm.c:276
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpm.c:266
+#: rpm.c:277
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:272
+#: rpm.c:283
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "ťČÍŃËĄ:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "¤ł¤ÎĽáĽĂĽťĄźĽ¸¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   °Ę˛ź¤Î°úżô¤Ď¤š¤Ů¤Ć¤ÎĽâĄźĽÉ¤ÇťČÍѤǤ­¤Ţ¤š:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "/etc/rpmrc ¤Č $HOME/.rpmrc ¤ÎÂĺ¤ę¤Ë <file> ¤ňťČÍѤˇ¤Ţ¤š"
-
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "¤â¤ŚžŻ¤ˇžđĘóÉ˝ź¨¤ňÁý¤ä¤ˇ¤Ţ¤š"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "˝˝ĘŹ¤ËžđĘóÉ˝ź¨¤ňÁý¤ä¤ˇ¤Ţ¤š(ĽÇĽĐĽĂĽ°ÍŃ)"
+#: rpm.c:330
+msgid "    --eval '<name>+'      "
+msgstr ""
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "Ě䤤šç¤ď¤ťĽâĄźĽÉ"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
+#: rpm.c:332
+msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "ĽČĽĂĽ×ĽÇĽŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňťČÍѤˇ¤Ţ¤š"
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "ɸ˝ŕ˝ĐÎϤň <cmd> ¤ŘĽŃĽ¤Ľ×¤ˇ¤Ţ¤š"
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
+#: rpm.c:334
+msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "ĽÇĄźĽżĽŮĄźĽšÍѤμǼŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňÍѤ¤¤Ţ¤š"
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "/etc/rpmrc ¤Č $HOME/.rpmrc ¤ÎÂĺ¤ę¤Ë <file> ¤ňťČÍѤˇ¤Ţ¤š"
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "ĽŘĽĂĽŔĽŐĽŠĄźĽŢĽĂĽČ¤Č¤ˇ¤Ć <qfmt> ¤ňťČÍѤˇ¤Ţ¤š (-i ¤ÎĆŻ¤­¤ň´Ţ¤ß¤Ţ¤š)"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "¤â¤ŚžŻ¤ˇžđĘóÉ˝ź¨¤ňÁý¤ä¤ˇ¤Ţ¤š"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "˝˝ĘŹ¤ËžđĘóÉ˝ź¨¤ňÁý¤ä¤ˇ¤Ţ¤š(ĽÇĽĐĽĂĽ°ÍŃ)"
+
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr "ĽŐĽĄĽ¤ĽëĚž¤Č°Ę˛ź¤ÎĽŞĽ×ĽˇĽçĽó¤ÎÂĺ¤ę¤Ë ftp URL ¤ňťČ¤¨¤ë¤č¤Ś(-p ¤ňÍѤ¤¤Ć)"
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëĄ˘Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉĄ˘Ě䤤šç¤ď¤ť¤ˇ¤Ţ¤š:"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "ftp Ľ×ĽíĽ­Ľˇ¤ÎĽŰĽšĽČĚž¤â¤ˇ¤Ż¤Ď IP"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "ftp (¤â¤ˇ¤Ż¤ĎĽ×ĽíĽ­Ľˇ)ĽľĄźĽĐ¤ÎĽÝĄźĽČČÖšć"
 
-#: rpm.c:335
-msgid "      --httpproxy <host>   "
+#: rpm.c:350
+msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:351
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "http Ľ×ĽíĽ­Ľˇ¤ÎĽŰĽšĽČĚž¤â¤ˇ¤Ż¤Ď IP"
 
-#: rpm.c:337
-msgid "      --httpport <port>    "
+#: rpm.c:352
+msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:353
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "http (¤â¤ˇ¤Ż¤ĎĽ×ĽíĽ­Ľˇ)ĽľĄźĽĐ¤ÎĽÝĄźĽČČÖšć"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "Ě䤤šç¤ď¤ťĽâĄźĽÉ"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr ""
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "ĽÇĄźĽżĽŮĄźĽšÍѤμǼŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňÍѤ¤¤Ţ¤š"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr ""
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "ĽŘĽĂĽŔĽŐĽŠĄźĽŢĽĂĽČ¤Č¤ˇ¤Ć <qfmt> ¤ňťČÍѤˇ¤Ţ¤š (-i ¤ÎĆŻ¤­¤ň´Ţ¤ß¤Ţ¤š)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr ""
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "ĽČĽĂĽ×ĽÇĽŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňťČÍѤˇ¤Ţ¤š"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "Á´¤Ć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "<file> ¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 "(̤Ľ¤ĽóĽšĽČĄźĽë)ĽŃĽĂĽąĄźĽ¸ <packagefile> ¤ň\n"
 "Ě䤤šç¤ď¤ť¤Ţ¤š"
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:347
+#: rpm.c:372
 msgid "query packages triggered by <pkg>"
 msgstr "<pkg> ¤Ë¤č¤Ă¤ĆĽČĽęĽŹĄź¤ľ¤ě¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr "<cap> ¤ňÄ󜥤š¤ëĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr ""
 "<cap> ¤ÎľĄÇ˝¤ňÉŹÍפȤš¤ëĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤Ć\n"
 "Ě䤤šç¤ď¤ť¤Ţ¤š"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      žđĘóÁŞÂňĽŞĽ×ĽˇĽçĽó:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "ĽŃĽĂĽąĄźĽ¸žđĘó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎĘŃššÍúÎň¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë´Ţ¤Ţ¤ě¤ëĽŐĽĄĽ¤Ľë¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë´Ţ¤Ţ¤ě¤ëĽŐĽĄĽ¤Ľë¤ÎžőÂÖ¤ňÉ˝ź¨¤ˇ¤Ţ¤š(-l ¤ÎĆŻ¤­¤ň´Ţ¤ß¤Ţ¤š)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr ""
 "ĽŃĽĂĽąĄźĽ¸¤Ë´Ţ¤Ţ¤ě¤ëʸ˝ńĽŐĽĄĽ¤Ľë¤Î¤ß¤ÎžőÂÖ¤ňÉ˝ź¨¤ˇ\n"
 "\t\t\t     ¤Ţ¤š(-l ¤ÎĆŻ¤­¤ň´Ţ¤ß¤Ţ¤š)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "ŔßÄęĽŐĽĄĽ¤Ľë¤Î¤ß¤ňÉ˝ź¨¤ˇ¤Ţ¤š(-l ¤ÎĆŻ¤­¤ň´Ţ¤ß¤Ţ¤š)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -622,37 +655,25 @@ msgstr ""
 "¸ÄĄš¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ˛ÄÇ˝¤ĘÁ´žđĘó¤ňÉ˝ź¨¤ˇ¤Ţ¤š(-lĄ˘\n"
 "-cĄ˘-d ¤Î¤¤¤ş¤ě¤Ť¤ČśŚ¤ËÍѤ¤¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "¤ł¤ÎĽŃĽĂĽąĄźĽ¸¤ŹÄ󜥤š¤ëľĄÇ˝¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr ""
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "°Í¸¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸Ěž¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "[Ľ˘Ľó]Ľ¤ĽóĽšĽČĄźĽëťţ¤ÎĽšĽŻĽęĽ×ĽČ¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 "ĽŃĽĂĽąĄźĽ¸¤Ë´Ţ¤Ţ¤ě¤ëĽČĽęĽŹĄźĽšĽŻĽęĽ×ĽČ¤ňÉ˝ź¨¤ˇ¤Ţ\n"
 "\t\t\t       ¤š"
 
-#: rpm.c:379
-msgid "    --pipe <cmd>          "
-msgstr ""
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "ɸ˝ŕ˝ĐÎϤň <cmd> ¤ŘĽŃĽ¤Ľ×¤ˇ¤Ţ¤š"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -660,164 +681,155 @@ msgstr ""
 "-q ¤ČĆąÍͤËĆą¤¸ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó¤ňźč¤ę\n"
 "Ľ¤ĽóĽšĽČĄźĽë¤Îžőśˇ¤ň¸ĄžÚ¤ˇ¤Ţ¤š"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "ĽŐĽĄĽ¤Ľë¤Î md5 ĽÁĽ§ĽĂĽŻĽľĽŕ¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "ĽŐĽĄĽ¤Ľë°Ŕ­¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"-q ¤ČĆąÍͤËĆą¤¸ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó¤ňźč¤ę\n"
-"ĽÇĄźĽżĽŮĄźĽšĂć¤Îľö˛Ä°Ŕ­¤ËŔßÄꤡ¤Ţ¤š"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
 msgstr ""
-"-q ¤ČĆąÍͤËĆą¤¸ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó¤ňźč¤ę\n"
-"ĽÇĄźĽżĽŮĄźĽšĂć¤Î˝ęÍ­źÔ¤ČĽ°ĽëĄźĽ×¤ËŔßÄꤡ¤Ţ¤š"
+"Ě䤤šç¤ď¤ťĽŐĽŠĄźĽŢĽĂĽČĂć¤ËÍѤ¤¤é¤ěĆŔ¤ëĽżĽ°¤ň\n"
+"\t\t\t      É˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:402
+#: rpm.c:418
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:403
+#: rpm.c:419
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: rpm.c:405
+#: rpm.c:421
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:406
+#: rpm.c:422
 #, fuzzy
 msgid "skip files in path <path>"
 msgstr "ĽŃĽš <path> Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "<oldpath> ¤Ť¤é <newpath> ¤ËĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ľ¤ť¤Ţ¤š"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "ĽŃĽĂĽąĄźĽ¸¤ŹśŘťß¤ˇ¤Ć¤¤¤Ţ¤š¤ŹĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ˇ¤Ţ¤š"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "ĽŃĽš %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó(ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ËÂФˇ¤Ć)"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "şĆÇŰĂÖ˛ÄÇ˝¤ĘĽŃĽĂĽąĄźĽ¸¤ËÂФˇĄ˘Ľ¤ĽóĽšĽČĄźĽëĽŃĽš\n"
 "ŔÜĆŹź­¤ň <dir> ¤ËŔßÄꤡ¤Ţ¤š"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "ĽÉĽ­ĽĺĽáĽóĽČ¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs ¤Č --replacefiles ¤ňĂť˝Ě¤ˇ¤ż¤â¤Î"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëşÝ¤Ë '#' ¤ÇÉ˝ź¨¤ˇ¤Ţ¤š(-v ¤ňťČÍѤš¤ë¤ČÎɤ¤)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "ŔßÄę¤ňĽšĽ­ĽĂĽ×¤ˇĄ˘Á´ĽŐĽĄĽ¤Ľë¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎÂОݼ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëÁ°¤ËĽÇĽŁĽšĽŻ¤ÎÍĆÎĚĽÁĽ§ĽĂĽŻ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "ĽŃĽĂĽąĄźĽ¸ÂĐžÝOS¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "ĽÉĽ­ĽĺĽáĽóĽČ¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 "ĽÇĄźĽżĽŮĄźĽš¤ňššżˇ¤ˇ¤Ţ¤š¤ŹĄ˘\n"
 "ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕ¤ÎĘŃšš¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "°Í¸Ŕ­¤ňËţ¤ż¤š¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Î\n"
 "Ľ¤ĽóĽšĽČĄźĽë¤ňÍ׾ᤡ¤Ţ¤ť¤ó"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 "¤ł¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆĽČĽęĽŹĄź¤ľ¤ě¤ëĽšĽŻĽęĽ×ĽČ¤ň\n"
 "źÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëşÝ¤Ë '%' ¤ÇÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr ""
 "Ľ¤ĽóĽšĽČĄźĽëťţ¤ËĂÖ¤­´š¤¨¤é¤ě¤ëĽŐĽĄĽ¤Ľë¤Ź\n"
 "¤˘¤Ă¤Ć¤âĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "´ű¤Ë¸şß¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ç¤âşĆĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤ť¤ş¤ËĄ˘ĽĆĽšĽČ¤Î¤ßšÔ¤¤¤Ţ¤š"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:471
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 "ĽŃĽĂĽąĄźĽ¸¤ňĽ˘ĽĂĽ×Ľ°ĽěĄźĽÉ¤ˇ¤Ţ¤š(--install "
 "¤Č´ö¤Ä¤Ť¤ÎĽŞĽ×ĽˇĽçĽó¤ňÉŐ¤ąÂ­¤ˇ¤ż¤â¤Î)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -825,15 +837,15 @@ msgstr ""
 "¸Ĺ¤¤ĽĐĄźĽ¸ĽçĽó¤ÎĽŃĽĂĽąĄźĽ¸¤ËĽ˘ĽĂĽ×Ľ°ĽěĄźĽÉ¤ˇ¤Ţ¤š\n"
 "(Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉťţ¤Î --force ¤Ď¤ł¤ě¤ňźŤĆ°Ĺޤ˚Ԥ¤¤Ţ¤š)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ňşď˝ü(Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë)¤ˇ¤Ţ¤š"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -841,89 +853,90 @@ msgstr ""
 "<package> ¤Č°ěĂפš¤ëĽŃĽĂĽąĄźĽ¸Á´¤Ć¤ňşď˝ü¤ˇ¤Ţ¤š(°ěČĚ\n"
 "\t\t\t      ĹŞ¤ËĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤚ¤ë¤ČĽ¨ĽéĄź¤Ë¤Ę¤ę¤Ţ¤š)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "ĽŃĽĂĽąĄźĽ¸ťŘÄę¤ÎĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ňşîŔŽ¤ˇ¤Ţ¤šĄ˘<stage> ¤Ď°Ę˛ź¤Î¤Ś¤Á¤Ň¤Č¤Ä¤Ç¤š:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (Ľ˝ĄźĽš¤ňŸłŤ¤ˇĽŃĽĂĽÁ¤ňĹö¤Ć¤Ţ¤š)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "ĽęĽšĽČ¸Ąşş (%files ĽťĽŻĽˇĽçĽó¤ÎÂç¤Ţ¤Ť¤ĘĽÁĽ§ĽĂĽŻ)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "ĽłĽóĽŃĽ¤Ľë (prepĄ˘compile)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë (prepĄ˘compileĄ˘install)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "ĽĐĽ¤ĽĘĽę¤ňĽŃĽĂĽąĄźĽ¸˛˝ (prepĄ˘compileĄ˘installĄ˘package)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "ĽĐĽ¤ĽĘĽę/Ľ˝ĄźĽš¤ňĽŃĽĂĽąĄźĽ¸˛˝ (prepĄ˘compileĄ˘installĄ˘package)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
-msgstr "ĽŃĽĂĽąĄźĽ¸˛˝¸ĺĽ˝ĄźĽšĽŐĽĄĽ¤Ľë¤Č spec ĽŐĽĄĽ¤Ľë¤ňşď˝ü¤ˇ¤Ţ¤š"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
+msgstr "˝ŞÎť¸ĺĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤ňşď˝ü¤ˇ¤Ţ¤š"
 
-#: rpm.c:502
+#: rpm.c:520
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP/GPG ˝đĚž¤ňŔ¸ŔŽ¤ˇ¤Ţ¤š"
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "BuildRoot ¤Č¤ˇ¤Ć <dir> ¤ňÍѤ¤¤Ţ¤š"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:509
+#: rpm.c:527
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:510
+#: rpm.c:528
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "ĽżĽ¤ĽŕĽÁĽ§ĽĂĽŻ´ü¸Â¤ňŔßÄꤡ¤Ţ¤š(0¤ÇĚľ¸ú)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -932,163 +945,169 @@ msgstr ""
 "\t\t\t     Ľ¸¤ňşîŔŽ¤ˇĄ˘specĽŐĽĄĽ¤ĽëĄ˘Ľ˝ĄźĽšĽŐĽĄĽ¤ĽëĄ˘ĽŃĽĂĽÁĄ˘\n"
 "\t\t\t     Ľ˘Ľ¤ĽłĽó¤ňşď˝ü¤ˇ¤Ţ¤š"
 
-#: rpm.c:514
-msgid "    --rmsource <spec>     "
-msgstr ""
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "Ľ˝ĄźĽšĽŐĽĄĽ¤Ľë¤Č spec ĽŐĽĄĽ¤Ľë¤ňşď˝ü¤ˇ¤Ţ¤š"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "--rebuild ¤Ëť÷¤Ć¤¤¤Ţ¤š¤ŹĄ˘ĽŃĽĂĽąĄźĽ¸¤ňşîŔŽ¤ˇ¤Ţ¤ť¤ó"
 
-#: rpm.c:518
+#: rpm.c:536
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ˇ¤Ţ¤š(¸˝şß¤Î˝đĚž¤ĎźÎ¤Ć¤é¤ě¤Ţ¤š)"
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ňÄɲ䡤ޤš"
 
-#: rpm.c:523
-msgid "    --checksig <pkg>+     "
+#: rpm.c:540
+msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:524
+#: rpm.c:541
+msgid "    -K <pkg>+           "
+msgstr ""
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "PGP ˝đĚž¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: rpm.c:528
+#: rpm.c:546
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "GPG ˝đĚž¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "MD5 ˝đĚž¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr ""
-"Ě䤤šç¤ď¤ťĽŐĽŠĄźĽŢĽĂĽČĂć¤ËÍѤ¤¤é¤ěĆŔ¤ëĽżĽ°¤ň\n"
-"\t\t\t      É˝ź¨¤ˇ¤Ţ¤š"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "Í­¸ú¤ĘĽÇĄźĽżĽŮĄźĽš¤ŹÂ¸şß¤š¤ë¤ł¤Č¤ňłÎ¤Ť¤á¤Ţ¤š"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "´ű¸¤ÎĽÇĄźĽżĽŮĄźĽš¤Ť¤éĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"-q ¤ČĆąÍͤËĆą¤¸ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó¤ňźč¤ę\n"
+"ĽÇĄźĽżĽŮĄźĽšĂć¤Îľö˛Ä°Ŕ­¤ËŔßÄꤡ¤Ţ¤š"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"-q ¤ČĆąÍͤËĆą¤¸ĽŃĽĂĽąĄźĽ¸ťŘÄ꼪Ľ×ĽˇĽçĽó¤ňźč¤ę\n"
+"ĽÇĄźĽżĽŮĄźĽšĂć¤Î˝ęÍ­źÔ¤ČĽ°ĽëĄźĽ×¤ËŔßÄꤡ¤Ţ¤š"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "°ě¤Ä¤ÎĽáĽ¸ĽăĄźĽâĄźĽÉ¤Î¤ß¤ňťŘÄꤡ¤Ć¤Ż¤Ŕ¤ľ¤¤"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ¤Č --uninstall ¤Ď¤â¤Ď¤äĆ°şî¤ˇ¤Ţ¤ť¤ó\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "-e ¤Ť --erase ¤ňťČ¤Ă¤Ć¤Ż¤Ŕ¤ľ¤¤\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) ¤Ď aĄ˘bĄ˘iĄ˘cĄ˘pĄ˘l ¤Î¤É¤ě¤Ť°ě¤Ä¤Î°úżô¤ňÉŹÍפȤˇ¤Ţ¤š"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--tarbuild (-t) ¤Ď aĄ˘bĄ˘iĄ˘cĄ˘pĄ˘l ¤Î¤É¤ě¤Ť°ě¤Ä¤Î°úżô¤ňÉŹÍפȤˇ¤Ţ¤š"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "Ě䤤šç¤ď¤ť/¸ĄžÚ¤Ď°ěĹ٤˰ě¤Ä¤ˇ¤ŤźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "--dbpath ¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "şĆÇŰĂÖ¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "şĆÇŰĂÖ¤Ď = ¤ň´Ţ¤ó¤Ç¤¤¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "şĆÇŰĂÖ¤Ď = ¤ÎźĄ¤Ë / ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:897
+#: rpm.c:932
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "˝üł°¤š¤ëĽŃĽš¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:906
+#: rpm.c:941
 #, fuzzy, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "°úżô˝čÍý(%d)¤Ç¤ÎĆâÉôĽ¨ĽéĄź :-(\n"
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "ĽÇĄźĽżĽŮĄźĽš¤ňťČÍѤˇ¤Ę¤¤¤Î¤Ë --dbpath ¤ŹÍż¤¨¤é¤ě¤Ć¤¤¤Ţ¤š"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck ¤ĎĽŃĽĂĽąĄźĽ¸şîŔŽťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽéĽ°"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽŠĄźĽŢĽĂĽČ"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽ˝ĄźĽš"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "Ľ¤ĽóĽšĽČĄźĽëĄ˘Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉĄ˘Ľ˝ĄźĽšşď˝üĄ˘ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľëşď˝üťţ¤Î¤ßśŻŔŠ¤Ç¤­¤"
 "ޤš"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "ĽŐĽĄĽ¤Ľë¤ĎĽŃĽĂĽąĄźĽ¸Ľ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßşĆÇŰĂ֤Ǥ­¤Ţ¤š"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix ¤â¤ˇ¤Ż¤Ď --relocate ¤Î¤¤¤ş¤ě¤Ť¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:985
+#: rpm.c:1022
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
@@ -1096,80 +1115,80 @@ msgstr ""
 "--relocate ¤Č --excludepath "
 "¤Ďżˇ¤ˇ¤¤ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix ¤ĎżˇľŹ¤ËĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ¤Ř¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ¤Č --includedocs ¤Ď¤É¤Á¤é¤Ť°ěĘý¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "-ignoreos ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1030
+#: rpm.c:1067
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "-ignoresize ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ¤ĎĽŃĽĂĽąĄźĽ¸¤Îşď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr "--noscripts ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘¸ĄžÚťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr "--notriggers ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘¸ĄžÚťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1177,13 +1196,13 @@ msgid ""
 msgstr ""
 "--nodeps ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎşîŔŽĄ˘Ľ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘¸ĄžÚťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘şîŔŽťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1191,15 +1210,15 @@ msgstr ""
 "--root (-r) "
 "¤ĎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘Ě䤤šç¤ď¤ťĄ˘ĽÇĄźĽżĽŮĄźĽšşĆš˝ĂŰťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage ¤ĎĽ˘ĽĂĽ×Ľ°ĽěĄźĽÉťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
@@ -1207,7 +1226,7 @@ msgstr ""
 "ĽŞĽ×ĽˇĽçĽó¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĚ䤤šç¤ď¤ťĄ˘Ľ¤ĽóĽšĽČĄźĽëĄ˘Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉťţ¤Î¤ßťČÍѤǤ"
 "­¤Ţ¤š"
 
-#: rpm.c:1093
+#: rpm.c:1131
 #, fuzzy
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
@@ -1216,105 +1235,105 @@ msgstr ""
 "ĽŞĽ×ĽˇĽçĽó¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĚ䤤šç¤ď¤ťĄ˘Ľ¤ĽóĽšĽČĄźĽëĄ˘Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉťţ¤Î¤ßťČÍѤǤ"
 "­¤Ţ¤š\n"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp ¤Ď˝đĚž¸Ąşşťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:1100
+#: rpm.c:1139
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg ¤Ď˝đĚž¸Ąşşťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:1103
+#: rpm.c:1142
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 ¤Ď˝đĚž¸Ąşş¤ČĽŃĽĂĽąĄźĽ¸¸ĄžÚťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr "˝đĚž¤š¤ë¤ż¤á¤ÎĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó\n"
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ËĽ˘ĽŻĽťĽš¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: rpm.c:1151
+#: rpm.c:1192
 #, fuzzy
 msgid "pgp not found: "
 msgstr "pgp ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó: "
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr "ĽŃĽšĽŐĽěĄźĽş¤ňĆţÎϤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤: "
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "ĽŃĽšĽŐĽěĄźĽşĽÁĽ§ĽĂĽŻ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "ĽŃĽšĽŐĽěĄźĽş¤ĎŔľžď¤Ç¤šĄĽ\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤ĽëĂć¤ÎĚľ¸ú¤Ę %%_signature ĄŁ\n"
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign ¤ĎĽŃĽĂĽąĄźĽ¸şîŔŽťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpm.c:1186
+#: rpm.c:1227
 msgid "exec failed\n"
 msgstr "źÂšÔźşÇÔ\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ¤Î°úżô¤Ź´Ö°ă¤Ă¤Ć¤¤¤Ţ¤š"
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "˝đĚž¸Ąşş¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "˝đĚž¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "şĆşîŔŽ¤š¤ë¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "şîŔŽ¤Î¤ż¤á¤Î spec ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "şîŔŽ(build)¤Î¤ż¤á¤Î tar ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "Á´ĽŃĽĂĽąĄźĽ¸¤ÎĚ䤤šç¤ď¤ť¤Î¤ż¤á¤Ë͞ʏ¤Ę°úżô¤Ź¤˘¤ę¤Ţ¤š"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "Á´ĽŃĽĂĽąĄźĽ¸¤Î¸ĄžÚ¤Î¤ż¤á¤Ë͞ʏ¤Ę°úżô¤Ź¤˘¤ę¤Ţ¤š"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "¸ĄžÚ¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
@@ -3725,6 +3744,15 @@ msgstr "%s ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s ¤Î¤ż¤á¤Î°Í¸Ŕ­¤ňËţ¤ż¤ˇ¤Ć¤¤¤Ţ¤ť¤ó:"
 
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "ĽŃĽĂĽąĄźĽ¸¤ŹśŘťß¤ˇ¤Ć¤¤¤Ţ¤š¤ŹĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ˇ¤Ţ¤š"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "ĽŃĽĂĽąĄźĽ¸˛˝¸ĺĽ˝ĄźĽšĽŐĽĄĽ¤Ľë¤Č spec ĽŐĽĄĽ¤Ľë¤ňşď˝ü¤ˇ¤Ţ¤š"
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "Ľ˝ĄźĽšĽŐĽĄĽ¤Ľë¤Č spec ĽŐĽĄĽ¤Ľë¤ňşď˝ü¤ˇ¤Ţ¤š"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
diff --git a/po/pl.po b/po/pl.po
index 0c48c25e7..225ab8f31 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -91,7 +91,7 @@ msgstr "wymuś rodzaj systemu operacyjnego"
 msgid "override build root"
 msgstr "wymuś build root"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "usuń budowane drzewo po skończeniu"
 
@@ -103,7 +103,7 @@ msgstr "nie wykonuj żadnych etapów budowania"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "nie akceptuj wpisów I18N ze speca"
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 msgid "remove sources when done"
 msgstr "usuń źródła po zakończeniu"
 
@@ -111,7 +111,7 @@ msgstr "usuń źródła po zakończeniu"
 msgid "remove specfile when done"
 msgstr "usuń speca po zakończeniu"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "przejdź od razu do podanego etapu (tylko dla c,i)"
 
@@ -167,634 +167,648 @@ msgstr "nie znaleziono pakietu w bazie danych"
 msgid "no copyright!\n"
 msgstr "brak praw autorskich!\n"
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM wersja %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:216
+#: rpm.c:227
 #, fuzzy
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Program może być swobodnie rozpowszechniany na warunkach licencji GNU"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "Użycie: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <katalog>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <katalog>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <katalog>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <host>] [--httpport <port>] "
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--noorder] [--relocate stara-ścieżka=nowa-ścieżka]"
 
-#: rpm.c:235
+#: rpm.c:246
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <ścieżka>]"
 
-#: rpm.c:236
+#: rpm.c:247
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] plik1.rpm ... plikN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <katalog>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <plik>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <katalog>] [--prefix "
 "<katalog>] "
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <port>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:245
+#: rpm.c:256
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <ścieżka>] [--ignoresize]"
 
-#: rpm.c:246
+#: rpm.c:257
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        plik1.rpm ... plikN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:253
+#: rpm.c:264
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <katalog>] [cele]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <katalog>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [cele]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [cel]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [cel]"
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        plik1.rpm ... plikN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <katalog>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] pakiet1 ... pakietN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile <plik>]"
 
-#: rpm.c:264
+#: rpm.c:275
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 
-#: rpm.c:265
+#: rpm.c:276
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=platforma1[,platforma2...]]"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] plik_spec"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "       rpm {--rmsource} [--rcfile <plik>] [-v] plik_spec"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <plik>] [-v] źródłowy1.rpm ... źródłowyN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <plik>] [-v] źródłowy1.rpm ... "
 "źródłowyN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
-#: rpm.c:272
+#: rpm.c:283
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           pakiet1 ... pakietN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "użycie:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "wyświetl ten tekst"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "wyświetl wersję używanego rpm-a"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   wszystkie tryby pracy pozwalają użyć następujących argumentów:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
-msgstr "      --rcfile <plik>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
+msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "użyj <plik> zamiast /etc/rpmrc i $HOME/.rpmrc"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "wyświetlaj nieco więcej komunikatów"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    --pipe <komenda>      "
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "wyświetlaj BARDZO dużo komunikatów (dla odpluskwiania)"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "wyświetl wersję używanego rpm-a"
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "tryb odpytywania"
+#: rpm.c:332
+msgid "    --pipe <cmd>          "
+msgstr "    --pipe <komenda>      "
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr "      --root <katalog>        "
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "przekaż standartowe wyjście do <komenda>"
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "użyj <katalogu> jako katalogu najwyższego poziomu"
+#: rpm.c:334
+#, fuzzy
+msgid "    --rcfile <file>       "
+msgstr "      --rcfile <plik>     "
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
-msgstr "      --dbpath <katalog>      "
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "użyj <plik> zamiast /etc/rpmrc i $HOME/.rpmrc"
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "użyj <katalog> jako katalogu bazy pakietów"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
+msgstr ""
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
-msgstr "      --queryformat <format zapytania>"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "wyświetlaj nieco więcej komunikatów"
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "użyj <format zapytania> jako formatu nagłówka (dotyczy -i)"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "wyświetlaj BARDZO dużo komunikatów (dla odpluskwiania)"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   instalacja, uaktualnianie i odpytywanie (z opcją -p) pozwalają użyć URL'a "
 "ftp zamiast"
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr "   nazwy pliku tak jak i następujących opcji:"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <host>   "
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "nazwa lub numer IP maszyny będącej ftp proksy"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "numer portu serwera ftp (lub proksy)"
 
-#: rpm.c:335
-msgid "      --httpproxy <host>   "
+#: rpm.c:350
+#, fuzzy
+msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <host>   "
 
-#: rpm.c:336
+#: rpm.c:351
 msgid "hostname or IP of http proxy"
 msgstr "nazwa lub IP hosta będącego http proksy"
 
-#: rpm.c:337
-msgid "      --httpport <port>    "
+#: rpm.c:352
+#, fuzzy
+msgid "      --httpport <port>   "
 msgstr "      --httpport <port>    "
 
-#: rpm.c:338
+#: rpm.c:353
 msgid "port number of http server (or proxy)"
 msgstr "numer portu serwera http (albo proksy)"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "tryb odpytywania"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr "      --dbpath <katalog>      "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "użyj <katalog> jako katalogu bazy pakietów"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr "      --queryformat <format zapytania>"
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "użyj <format zapytania> jako formatu nagłówka (dotyczy -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr "      --root <katalog>        "
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "użyj <katalogu> jako katalogu najwyższego poziomu"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Opcje selekcjonujące pakiety:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "odpytuj wszystkie pakiety"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr "        -f <plik>+        "
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "zapytaj do jakiego pakietu należy <plik>"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr "        -p <nazwa pakietu>+ "
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "odpytaj (niezainstalowany) pakiet <nazwa pakietu>"
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pakiet>"
 
-#: rpm.c:347
+#: rpm.c:372
 msgid "query packages triggered by <pkg>"
 msgstr "odpytaj pakiety zahaczane przez <pakiet>"
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <zas>"
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr "odszukaj pakiety udostępniające zasób <zas>"
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <zas>"
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr "odszukaj pakiety wymagające zasobu <zas>"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Opcje odpytujące pakiety:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "wyświetl informację o pakiecie"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "wyświetl wykaz zmian dokonanych w pakiecie"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "wyświetl listę plików zawartych w pakiecie"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "pokaż statusy plików (dotyczy -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "wyświetl tylko pliki dokumentacji (dotyczy -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "wyświetl tylko pliki konfiguracyjne (dotyczy -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 "pokaż wszystkie informacje o każdym pliku (musi być użyte z -l, -c lub -d)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "wypisz zasoby udostępniane przez pakiet"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr "        --requires"
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "wypisz zależności pakietu"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "wyświetl skrypty [de]instalacyjne"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr "wyświetl trigger skrypty zawarte w pakiecie"
 
-#: rpm.c:379
-msgid "    --pipe <cmd>          "
-msgstr "    --pipe <komenda>      "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "przekaż standartowe wyjście do <komenda>"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "sprawdź stan pakietu (używa tych samych opcji co -q)"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "nie sprawdzaj zależności pakietu"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "nie sprawdzaj sum kontrolnych md5 plików"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "nie sprawdzaj atrybutów plików"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"ustaw prawa dostępu takie jak zapisano w bazie pakietów (używa tych samych "
-"opcji co -q)"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"ustaw właściciela i grupę takie jak zapisano w bazie pakietów (używa tych "
-"samych opcji co -q)"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "wypisz etykiety własności, o które można zapytać"
 
-#: rpm.c:402
+#: rpm.c:418
 msgid "    --install <packagefile>"
 msgstr "    --install <nazwa pakietu>"
 
-#: rpm.c:403
+#: rpm.c:419
 msgid "    -i <packagefile>      "
 msgstr "    -i <nazwa pakietu>      "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "instaluj pakiet"
 
-#: rpm.c:405
+#: rpm.c:421
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <ścieżka>"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr "pomiń pliki leżące w <ścieżce>"
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stara-ścieżka>=<nowa-ścieżka>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "przesuń pliki z drzewa <stara-ścieżka> do drzewa <nowa-ścieżka>"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "przesuń pliki nawet gdy pakiet na to nie pozwala"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "nie można użyć ścieżki %s przy przesuwaniu pakietu %s-%s-%s"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <katalog>      "
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "przesuń pliki pakietu do drzewa <katalog>, jeśli jest przesuwalny"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "nie instaluj dokumentacji"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "wyświetlaj znaki hash przy instalacji (fajne z -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaluj wszystkie pliki, nawet konfiguracyjne, które w innym przypadku by "
 "pominęto"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "nie sprawdzaj architektury systemu"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr "nie sprawdzaj zajętości dysku przed instalacją"
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "nie sprawdzaj rodzaju systemu operacyjnego"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "zainstaluj dokumentację"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "odśwież bazę, ale nie modyfikuj systemu plików"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nie zmieniaj kolejności instalacji pakietów by zapewnić zależności"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "nie wykonuj żadnych skryptów instalacyjnych"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "wyświetlaj stan instalacji w procentach"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "instaluj nawet gdy pakiet zastępuje inne zainstalowane pliki"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "przeinstaluj jeśli pakiet jest już zainstalowany"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "nie instaluj, podaj tylko czy instalacja zadziała czy nie"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <nazwa pakietu>"
 
-#: rpm.c:455
+#: rpm.c:471
 msgid "    -U <packagefile>      "
 msgstr "    -U <nazwa pakietu>      "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "uaktualnij pakiet (te same opcje jak --install, plus)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -802,15 +816,15 @@ msgstr ""
 "uaktualnij do starej wersji (--force robi to samo automatycznie podczas "
 "uaktualniania)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr "    --erase <pakiet>"
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "usuń (odinstaluj) pakiet"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -818,89 +832,90 @@ msgstr ""
 "usuń wszystkie pakiety, które spełniają wzorzec <pakiet> (zazwyczaj "
 "wyświetlany jest błąd gdy <pakiet> opisuje wiele pakietów)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "nie wykonuj żadnych skryptów instalacyjnych"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<etap> <plik-spec>  "
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etap> <plik-tar>   "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "buduj pakiet, gdzie <etap> to:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "preparuj (rozpakuj źródła i nałóż łaty)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 "sprawdzanie z listy (wykonuje kilka podstawowych weryfikacji na %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "kompiluj (preparuj i kompiluj)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "instaluj (preparuj, kompiluj i instaluj)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "pakiet binarny (preparuj, kompiluj, instaluj, pakiet)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "pakiet binarny/źródłowy (preparuj, kompiluj, instaluj, pakiet)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
-msgstr "usuń źródła i plik spec po skończeniu"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
+msgstr "usuń speca po zakończeniu"
 
-#: rpm.c:502
+#: rpm.c:520
 msgid "generate PGP/GPG signature"
 msgstr "generuj sygnaturę PGP/GPG"
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <katalog>"
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "użyj <katalog> jako korzeń budowanego drzewa"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr "      --target=<platforma>+"
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "buduj pakiety dla platform docelowych platforma1...platformaN."
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "nie wykonuj żadnych etapów"
 
-#: rpm.c:509
+#: rpm.c:527
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sekundy>"
 
-#: rpm.c:510
+#: rpm.c:528
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "ustaw sprawdzanie czasu do ilości <sekund> (0 wyłącza)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <pkt_źródł> "
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -908,221 +923,231 @@ msgstr ""
 "instaluj pakiet źródłowy, buduj pakiet binarny i usuń plik spec, źródła, "
 "łaty i ikony"
 
-#: rpm.c:514
-msgid "    --rmsource <spec>     "
-msgstr "    --rmsource <plik spec>"
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "usuń plik spec i źródła"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <pkt_źródł>"
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "jak --rebuild, ale nie buduj żadnych pakietów"
 
-#: rpm.c:518
+#: rpm.c:536
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pakiet>+    "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "podpisz pakiet (porzuć bierzącą sygnaturę)"
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pakiet>+   "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "dodaj sygnaturę do pakietu"
 
-#: rpm.c:523
-msgid "    --checksig <pkg>+     "
+#: rpm.c:540
+#, fuzzy
+msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pakiet>+  "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    --resign <pakiet>+    "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "sprawdź sygnaturę pakietu"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "pomiń wszelkie sygnatury PGP"
 
-#: rpm.c:528
+#: rpm.c:546
 msgid "skip any GPG signatures"
 msgstr "pomiń wszelkie sygnatury GPG"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "pomiń wszelkie sygnatury MD5"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "wypisz etykiety własności, o które można zapytać"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "upewnij się, że poprawna baza istnieje"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "przebuduj istniejącą bazę"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"ustaw prawa dostępu takie jak zapisano w bazie pakietów (używa tych samych "
+"opcji co -q)"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"ustaw właściciela i grupę takie jak zapisano w bazie pakietów (używa tych "
+"samych opcji co -q)"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "tylko jeden główny tryb pracy może być podany"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u i --uninstall nie są już obsługiwane i nie pracują.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Użyj -e lub --erase\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) wymaga koniecznie jednego z a,b,i,c,p,l"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--tarbuild (-t) wymaga koniecznie jednego z a,b,i,c,p,l"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "tylko jeden typ odpytywania/sprawdzania można wykonać na raz"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "argumenty dla --dbpath muszą zaczynać sie od /"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "drzewa przesunięć muszą zaczynać sie od /"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "specyfikacja przesunięcia musi zawierać ="
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "specyfikacja przesunięcia musi zawierać / po ="
 
-#: rpm.c:897
+#: rpm.c:932
 msgid "exclude paths must begin with a /"
 msgstr "ścieżki wyłączeń muszą się zaczynać od /"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Błąd wewnętrzny w przetwarzaniu argumentu (%d) :-(\n"
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath podano dla operacji nie używającej bazy"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck można używać tylko w trakcie budowania pakietów"
 
-#: rpm.c:964
+#: rpm.c:1001
 msgid "unexpected query flags"
 msgstr "błędna konstrukcja argumentów odpytywania"
 
-#: rpm.c:967
+#: rpm.c:1004
 msgid "unexpected query format"
 msgstr "błędna konstrukcja argumentów odpytywania"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "błędna konstrukcja argumentów odpytywania"
 
-#: rpm.c:976
+#: rpm.c:1013
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "tylko instalację, uaktualnienie i usuwanie źródeł można wymusić"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "przesuwania plików można dokonać tylko w trakcie instalacji"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "nie można jednocześnie użyć --prefix i --relocate"
 
-#: rpm.c:985
+#: rpm.c:1022
 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"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix można użyć tylko w trakcie instalacji nowych pakietów"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty dla --prefix muszą się rozpoczynać od /"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "nie można jednocześnie użyć --excludedocs i --includedocs"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1030
+#: rpm.c:1067
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches można użyć tylko w trakcie usuwania pakietów"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles można użyć tylko w trakcie instalacji pakietów"
 
-#: rpm.c:1042
+#: rpm.c:1079
 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"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1130,7 +1155,7 @@ msgstr ""
 "--noscripts można użyć tylko w trakcie instalacji, usuwania lub sprawdzania "
 "pakietów"
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1138,7 +1163,7 @@ msgstr ""
 "--notriggers można użyć tylko w trakcie instalacji, usuwania lub sprawdzania "
 "pakietów"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1147,14 +1172,14 @@ msgstr ""
 "--nodeps można użyć tylko w trakcie budowania, instalacji, usuwania lub "
 "sprawdzania pakietów"
 
-#: rpm.c:1060
+#: rpm.c:1097
 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"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1162,120 +1187,120 @@ msgstr ""
 "--root (-r) można użyć tylko w trakcie instalacji, usuwania, sprawdzania "
 "pakietów lub przebudowywania bazy"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty dla --root (-r) muszą się rozpoczynać od /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage można użyć tylko podczas aktualizacji"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr "opcje ftp można użyć tylko podczas zapytań, instalacji i akualizacji"
 
-#: rpm.c:1093
+#: rpm.c:1131
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr "opcje http można użyć tylko podczas zapytań, instalacji i akualizacji"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp można użyć tylko w trakcie sprawdzania sygnatury"
 
-#: rpm.c:1100
+#: rpm.c:1139
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg można użyć tylko podczas sprawdzania sygnatury"
 
-#: rpm.c:1103
+#: rpm.c:1142
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nomd5 można użyć tylko podczas sprawdzania sygnatury i weryfkiacji pakietu"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "brak dostępu do pliku %s\n"
 
-#: rpm.c:1151
+#: rpm.c:1192
 msgid "pgp not found: "
 msgstr "nie znaleziono pgp: "
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr "Podaj hasło: "
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Weryfikacja hasła nieudana\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Hasło jest prawidłowe.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Błędny %%_signature spec w pliku makra.\n"
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign można użyć tylko w trakcie budowania pakietu"
 
-#: rpm.c:1186
+#: rpm.c:1227
 msgid "exec failed\n"
 msgstr "wykonanie nie powiodło się\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "nieoczekiwane argumenty dla --querytags "
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "nie podano nazwy pakietu do sprawdzenia sygnatury"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "nie podano nazwy pakietu do podpisania"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakietów do przebudowania"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "nie podano nazw plików spec do budowania"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "nie podano nazw plików tar do budowania"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "nie podano nazw plików do usunięcia"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "zbyt wiele argumentów dla odpytywania wszystkich pakietów"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "nie podano argumentów dla trybu zapytań"
 
-#: rpm.c:1415
+#: rpm.c:1456
 msgid "extra arguments given for verify of all packages"
 msgstr "zbyt wiele argumentów dla weryfikacji wszystkich pakietów"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "nie podano argumentów dla sprawdzania"
 
@@ -3626,6 +3651,21 @@ msgstr "brak    %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Niespełnione zależności dla %s-%s-%s: "
 
+#~ msgid "        --requires"
+#~ msgstr "        --requires"
+
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "przesuń pliki nawet gdy pakiet na to nie pozwala"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "usuń źródła i plik spec po skończeniu"
+
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    --rmsource <plik spec>"
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "usuń plik spec i źródła"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "plik %s nie należy do żadnego pakietu\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d348ad593..54cb14aa1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-05-17 12:19-0400\n"
+msgstr "POT-Creation-Date: 2000-05-24 13:46-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -88,7 +88,7 @@ msgstr "năo verifique o sistema operacional do pacote"
 msgid "override build root"
 msgstr "use s como o root da construçăo"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "remova a árvore de construçăo quando terminar"
 
@@ -101,7 +101,7 @@ msgstr "năo execute nenhum estágio"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "remova a árvore de construçăo quando terminar"
@@ -111,7 +111,7 @@ msgstr "remova a árvore de construçăo quando terminar"
 msgid "remove specfile when done"
 msgstr "remova a árvore de construçăo quando terminar"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "pule direto para o estágio especificado (somente para c,i)"
 
@@ -166,7 +166,7 @@ msgstr "năo foi passado pacote para desinstalaçăo"
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
@@ -179,148 +179,149 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versăo %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 "Este Software pode ser livremente redistribuido sob os termos da Licensa "
 "Pública GNU (GPL)"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "uso: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <diretório>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <diretório>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <arquivo>] [--ignorearch] [--dbpath "
 "<diretório>]"
 
-#: rpm.c:231
+#: rpm.c:242
 #, fuzzy
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr "                        [--prefix <diretório>] [--ignoreos] [--nodeps]"
 
-#: rpm.c:232
+#: rpm.c:243
 #, fuzzy
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 #, fuzzy
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:235
+#: rpm.c:246
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:236
+#: rpm.c:247
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <diretório>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <arquivo>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix "
 "<diretório>]"
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:243
+#: rpm.c:254
 #, fuzzy
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:245
+#: rpm.c:256
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--provides] [--dump] [--dbpath <diretório>] [alvos]"
 
-#: rpm.c:246
+#: rpm.c:257
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:261
 #, fuzzy
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
@@ -328,7 +329,7 @@ msgstr ""
 "                        [--ftpuseport] [--ftpproxy <host>] [--ftpport "
 "<porta>]"
 
-#: rpm.c:252
+#: rpm.c:263
 #, fuzzy
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
@@ -336,322 +337,356 @@ msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:253
+#: rpm.c:264
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 "                        [--provides] [--dump] [--dbpath <diretório>] [alvos]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [alvo]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [alvo]"
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 #, fuzzy
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
 "<arquivo>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 #, fuzzy
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "                           pacote1 ... pacoteN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<arquivo>]"
 
-#: rpm.c:264
+#: rpm.c:275
 #, fuzzy
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 "                        [--sign] [--test] [--timecheck <S>] arquivo-spec"
 
-#: rpm.c:265
+#: rpm.c:276
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 "                        [--sign] [--test] [--timecheck <S>] arquivo-spec"
 
-#: rpm.c:267
+#: rpm.c:278
 #, fuzzy
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 "       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
-#: rpm.c:272
+#: rpm.c:283
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <arquivo>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           pacote1 ... pacoteN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <arquivo>] [--dbpath <diretório>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "uso:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "mostra esta mensagem"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "mostra a versăo do programa rpm sendo usado"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   todos os modos suportam os seguintes argumentos:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "use <arquivo> no lugar de /etc/rpmrc e $HOME/.rpmrc"
-
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "seja um pouco mais detalhado"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "seja _muito_ mais detalhado (para depuraçăo)"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "modo pesquisa"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "mostra a versăo do programa rpm sendo usado"
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr ""
+#: rpm.c:332
+#, fuzzy
+msgid "    --pipe <cmd>          "
+msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "use <diretório> como diretório raiz"
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "envia a saida padrăo para <cmd>"
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
+#: rpm.c:334
 #, fuzzy
-msgid "      --dbpath <dir>      "
+msgid "    --rcfile <file>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "use <diretório> como diretório para o banco de dados"
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "use <arquivo> no lugar de /etc/rpmrc e $HOME/.rpmrc"
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:328
-#, fuzzy
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "use s como formato do cabeçalho (implica -i)"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "seja um pouco mais detalhado"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "seja _muito_ mais detalhado (para depuraçăo)"
+
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "  Instale, atualize e pesquise (com -p) permitem que sejam usadas URLs ftp "
 "no lugar"
 
-#: rpm.c:330
+#: rpm.c:345
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr "   de nomes de arquivos bem como as seguintes opçőes:\n"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "nome do host ou IP do proxy ftp"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "número da porta do servidor ftp (ou proxy)"
 
-#: rpm.c:335
+#: rpm.c:350
 #, fuzzy
-msgid "      --httpproxy <host>   "
+msgid "      --httpproxy <host>  "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:336
+#: rpm.c:351
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "nome do host ou IP do proxy ftp"
 
-#: rpm.c:337
+#: rpm.c:352
 #, fuzzy
-msgid "      --httpport <port>    "
+msgid "      --httpport <port>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:338
+#: rpm.c:353
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "número da porta do servidor ftp (ou proxy)"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "modo pesquisa"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+#, fuzzy
+msgid "      --dbpath <dir>      "
+msgstr "    -b<estágio> <spec>    "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "use <diretório> como diretório para o banco de dados"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr ""
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "use s como formato do cabeçalho (implica -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr ""
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "use <diretório> como diretório raiz"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Opcőes para especificaçăo de pacotes:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "pesquise todos os pacotes"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "pesquise pacote (năo instalado) <arquivo-pacote>"
 
-#: rpm.c:346
+#: rpm.c:371
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:347
+#: rpm.c:372
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:348
+#: rpm.c:373
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:349
+#: rpm.c:374
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
-#: rpm.c:350
+#: rpm.c:375
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:351
+#: rpm.c:376
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "pesquise pacotes que requerem capacidade <i>"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Opcőes de selecăo de informaçăo"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "mostre informaçăo do pacote"
 
-#: rpm.c:356
+#: rpm.c:381
 #, fuzzy
 msgid "display the package's change log"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "mostre estados dos arquivos (implica -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "liste somente os arquivos de documentaçăo (implica -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "liste somente os arquivos de configuraçăo (implica -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -659,37 +694,24 @@ msgstr ""
 "mostre todas as informaçőes verificáveis para cada arquivo (deve ser usado "
 "com -l, -c ou -d)"
 
-#: rpm.c:368
+#: rpm.c:393
 #, fuzzy
 msgid "list capabilities package provides"
 msgstr "lista as capacidades que o pacote fornece"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr ""
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "lista dependęncias do pacote"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "mostra as várias scripts de [des]instalaçăo"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:379
-#, fuzzy
-msgid "    --pipe <cmd>          "
-msgstr "    -b<estágio> <spec>    "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "envia a saida padrăo para <cmd>"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -697,158 +719,147 @@ msgstr ""
 "verifique uma instalaçăo de pacote usando as mesmas opçőes de especificaçăo "
 "de pacote do -q"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "năo verifique as dependęncias do pacote"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "năo verifique os checksums md5 do arquivo"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "năo verifique os atributos dos arquivos"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"atribua as permissőes dos arquivos para aquelas no banco de dados de pacotes "
-"usando as mesmas opçőes de especificaçăo de pacote do -q"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"atribua dono e grupo dos arquivos para aquelas no banco de dados de pacotes "
-"usando as mesmas opçőes de especificaçăo de pacote do -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "liste as etiquetas que podem ser usadas em um formato de pesquisa"
 
-#: rpm.c:402
+#: rpm.c:418
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "instale pacote"
 
-#: rpm.c:403
+#: rpm.c:419
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "instale pacote"
 
-#: rpm.c:405
+#: rpm.c:421
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:407
+#: rpm.c:423
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr ""
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "năo foi passado pacote para instalaçăo"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "realoque o pacote para <diretório>, se realocável"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "năo instale documentaçăo"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "aliás para --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "mostre caracteres # a medida que o pacote instala (bom com -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:426
+#: rpm.c:441
 #, fuzzy
 msgid "don't verify package architecture"
 msgstr "năo verifique a arquitetura do pacote"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "năo verifique o sistema operacional do pacote"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "instale documentaçăo"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 #, fuzzy
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "năo verifique as dependęncias do pacote"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "năo execute nenhuma script de instalaçăo"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "instale mesmo que o pacote substitua arquivos já instalados"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "reinstale se o pacote já estiver presente"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "năo instale, mas diga se a instalaçăo funcionará ou năo"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:471
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "atualize pacote (mesmas opcőes em --install, mais"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -856,15 +867,15 @@ msgstr ""
 "atualize para uma versăo mais velha do pacote (--force em atualizaçőes năo "
 "faz isto automaticamente)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "apague (desinstale) pacote"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -872,96 +883,96 @@ msgstr ""
 "remova todos os pacotes iguais a <pacote> (normalmente um erro é gerado se "
 "<pacote> especificou múltiplos pacotes)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "năo execute nenhuma script específica do pacote"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:481
+#: rpm.c:497
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "Constroi pacote, onde <estágio> é um dos seguintes:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (descompacte fontes e aplique patches)"
 
 # , c-format
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "cheque lista (faça algumas checagens em %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "compile (prep e compile)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "instale (prep, compile, instale)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "pacote binário (prep, compile, instale, pacote)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "pacote bin/src (prep, compile, instale, pacote)"
 
-#: rpm.c:500
+#: rpm.c:518
 #, fuzzy
-msgid "remove sources and spec file when done"
+msgid "remove spec file when done"
 msgstr "remova a árvore de construçăo quando terminar"
 
-#: rpm.c:502
+#: rpm.c:520
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "gere assinatura PGP"
 
-#: rpm.c:503
+#: rpm.c:521
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:504
+#: rpm.c:522
 #, fuzzy
 msgid "use <dir> as the build root"
 msgstr "use s como o root da construçăo"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "năo execute nenhum estágio"
 
-#: rpm.c:509
+#: rpm.c:527
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:510
+#: rpm.c:528
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "atribua S segundos ao tempo de checagem (0 o desabilita)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -969,247 +980,255 @@ msgstr ""
 "instale pacote fonte, construa pacote binário e remova o arquivo spec, "
 "fontes, patches e ícones."
 
-#: rpm.c:514
-#, fuzzy
-msgid "    --rmsource <spec>     "
-msgstr "    -b<estágio> <spec>    "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr ""
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "como --rebuild, mas năo construa nenhum pacote"
 
-#: rpm.c:518
+#: rpm.c:536
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
-#: rpm.c:520
+#: rpm.c:538
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "adicione uma assinatura a um pacote"
 
-#: rpm.c:523
+#: rpm.c:540
 #, fuzzy
-msgid "    --checksig <pkg>+     "
+msgid "    --checksig <pkg>+"
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    -b<estágio> <spec>    "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "verifique a assinatura do pacote"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "desconsidere quaisquer assinaturas PGP"
 
-#: rpm.c:528
+#: rpm.c:546
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "desconsidere quaisquer assinaturas PGP"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "desconsidere quaisquer assinaturas MD5"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "liste as etiquetas que podem ser usadas em um formato de pesquisa"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "certifique que um banco de dados válido existe"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"atribua as permissőes dos arquivos para aquelas no banco de dados de pacotes "
+"usando as mesmas opçőes de especificaçăo de pacote do -q"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"atribua dono e grupo dos arquivos para aquelas no banco de dados de pacotes "
+"usando as mesmas opçőes de especificaçăo de pacote do -q"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "somente um modo principal pode ser especificado"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u e --uninstall foram descontinuados e năo funcionam mais.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Use -e ou --erase no lugar.\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) requer um único argumento do tipo a,b,i,c,p,l"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--tarbuild (-t) requer um único argumento do tipo a,b,i,c,p,l"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "um tipo de pesquisa/verificaçăo pode ser feita por vez"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: rpm.c:883
+#: rpm.c:918
 #, fuzzy
 msgid "relocations must begin with a /"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:897
+#: rpm.c:932
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath passado para uma operaçăo que năo usa um banco de dados"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck somente pode ser usado durante a construçăo de pacotes"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "fonte de pesquisa năo esperado"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "fonte de pesquisa năo esperado"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "fonte de pesquisa năo esperado"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "somente instalaçăo e atualizaçăo podem ser forçadas"
 
-#: rpm.c:979
+#: rpm.c:1016
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:982
+#: rpm.c:1019
 #, fuzzy
 msgid "only one of --prefix or --relocate may be used"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpm.c:985
+#: rpm.c:1022
 #, 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"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 "--prefix somente pode ser usada quando se está instalando novos pacotes"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumentos para --prefix devem começar com uma /"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) somente podem ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--ignoreos somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1030
+#: rpm.c:1067
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--ignoreos somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches somente pode ser especificado durante desinstalaçőes de pacotes"
 
-#: rpm.c:1038
+#: rpm.c:1075
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaçőes de pacotes"
 
-#: rpm.c:1042
+#: rpm.c:1079
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test somente pode ser especificado durante [des]instalaçőes e construçőes "
 "de pacotes"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1217,7 +1236,7 @@ msgstr ""
 "--noscripts somente pode ser especificado durante [des]instalaçőes e "
 "verificaçőes de pacotes"
 
-#: rpm.c:1051
+#: rpm.c:1088
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1226,7 +1245,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalaçőes e "
 "verificaçőes de pacotes"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1235,7 +1254,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalaçőes e "
 "verificaçőes de pacotes"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1243,7 +1262,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaçőes e construçőes "
 "de pacotes"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1251,22 +1270,22 @@ msgstr ""
 "--root (-r) somente pode ser especificado durante [des]instalaçőes, "
 "pesquisas e reconstruçăo de bancos de dados"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumentos para --root (-r) devem começar com uma /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage somente pode ser usado durante a atualizaçăo de pacotes"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "opçőes ftp somente podem ser usadas durante pesquisas, instalaçőes e "
 "atualizaçőes de pacotes"
 
-#: rpm.c:1093
+#: rpm.c:1131
 #, fuzzy
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
@@ -1274,16 +1293,16 @@ msgstr ""
 "opçőes ftp somente podem ser usadas durante pesquisas, instalaçőes e "
 "atualizaçőes de pacotes"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
 
-#: rpm.c:1100
+#: rpm.c:1139
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
 
-#: rpm.c:1103
+#: rpm.c:1142
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
@@ -1291,91 +1310,91 @@ msgstr ""
 "--nopgp somente pode ser usado durante checagem de assinaturas e verificaçăo "
 "de pacotes"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:1151
+#: rpm.c:1192
 #, fuzzy
 msgid "pgp not found: "
 msgstr "năo foi passado pacote para desinstalaçăo"
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Checagem de pass phrase falhou\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Pass phrase ok.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign somente pode ser usado durante a construçăo de pacotes"
 
-#: rpm.c:1186
+#: rpm.c:1227
 #, fuzzy
 msgid "exec failed\n"
 msgstr "Construçăo falhou.\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos năo esperados em --querytags"
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "nenhum pacote informado para checagem de assinatura"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "năo foram passados pacotes para assinatura"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "năo foram passados pacotes para reconstruçăo"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "năo foi passado arquivo spec para construçăo"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "năo foram passados arquivos tar para construçăo"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "năo foi passado pacote para desinstalaçăo"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "năo foi passado pacote para instalaçăo"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "năo foi passado argumento para pesquisa"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "năo foi passado argumento para verificaçăo"
 
@@ -3845,6 +3864,14 @@ msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
 #, fuzzy
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "remova a árvore de construçăo quando terminar"
+
+#, fuzzy
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
 #~ msgid "key \"%s\" not found in %s"
 #~ msgstr "năo foi passado pacote para desinstalaçăo"
 
diff --git a/po/rpm.pot b/po/rpm.pot
index 9babdcdc7..3481d920c 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "override build root"
 msgstr ""
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 msgid "remove sources when done"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "remove specfile when done"
 msgstr ""
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
@@ -163,1056 +163,1067 @@ msgstr ""
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:235
+#: rpm.c:246
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:236
+#: rpm.c:247
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:256
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:246
+#: rpm.c:257
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:264
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:259
+#: rpm.c:270
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: rpm.c:264
+#: rpm.c:275
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 
-#: rpm.c:265
+#: rpm.c:276
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpm.c:266
+#: rpm.c:277
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:272
+#: rpm.c:283
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+msgid "Usage:"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:318
-msgid "be a little more verbose"
+#: rpm.c:330
+msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
+#: rpm.c:331
+msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:322
-msgid "query mode"
+#: rpm.c:332
+msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
+#: rpm.c:333
+msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
+#: rpm.c:334
+msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
+#: rpm.c:339
+msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:344
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:335
-msgid "      --httpproxy <host>   "
+#: rpm.c:350
+msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:351
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:337
-msgid "      --httpport <port>    "
+#: rpm.c:352
+msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:353
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr ""
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr ""
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr ""
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr ""
+
+#: rpm.c:361
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr ""
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr ""
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr ""
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:347
+#: rpm.c:372
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr ""
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:379
-msgid "    --pipe <cmd>          "
-msgstr ""
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:402
+#: rpm.c:418
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:403
+#: rpm.c:419
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr ""
 
-#: rpm.c:405
+#: rpm.c:421
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
+#: rpm.c:426
+msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:471
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
+#: rpm.c:518
+msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:502
+#: rpm.c:520
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:509
+#: rpm.c:527
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:510
+#: rpm.c:528
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:514
-msgid "    --rmsource <spec>     "
-msgstr ""
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr ""
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:518
+#: rpm.c:536
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:523
-msgid "    --checksig <pkg>+     "
+#: rpm.c:540
+msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:524
+#: rpm.c:541
+msgid "    -K <pkg>+           "
+msgstr ""
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:528
+#: rpm.c:546
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr ""
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr ""
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:897
+#: rpm.c:932
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr ""
 
-#: rpm.c:964
+#: rpm.c:1001
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:967
+#: rpm.c:1004
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:976
+#: rpm.c:1013
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:985
+#: rpm.c:1022
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1030
+#: rpm.c:1067
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:1055
+#: rpm.c:1092
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: rpm.c:1093
+#: rpm.c:1131
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:1100
+#: rpm.c:1139
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:1103
+#: rpm.c:1142
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:1151
+#: rpm.c:1192
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1186
+#: rpm.c:1227
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1415
+#: rpm.c:1456
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 9552c0a62..6f0562ac1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,7 +83,7 @@ msgstr "ĐĹŇĹĎĐŇĹÄĹĚÉÔŘ ďó ÓĎÂÉŇÁĹÍĎÇĎ ĐÁËĹÔÁ"
 msgid "override build root"
 msgstr "ĐĹŇĹĎĐŇĹÄĹĚÉÔŘ build root"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ ÄĹŇĹ×Ď ÉÓČĎÄÎÉËĎ×"
 
@@ -95,7 +95,7 @@ msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÜÔÁĐĎ× ÓÂĎŇËÉ"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "ÎĹ ĐŇÉÎÉÍÁÔŘ ÓÔŇĎË I18N ÉÚ spec-ĆÁĘĚÁ"
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 msgid "remove sources when done"
 msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ ÉÓČĎÄÎÉËb"
 
@@ -103,7 +103,7 @@ msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ ÉÓČĎÄÎÉËb"
 msgid "remove specfile when done"
 msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ spec-ĆÁĘĚ"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "ĐĹŇĹĘÔÉ ÎĹĐĎÓŇĹÄÓÔ×ĹÎÎĎ Ë ŐËÁÚÁÎÎĎÍŐ ÜÔÁĐŐ (ÔĎĚŘËĎ ÄĚŃ c,i)"
 
@@ -159,445 +159,482 @@ msgstr "ĐÁËĹÔ ÎĹ ÎÁĘÄĹÎ × ÂÁÚĹ ÄÁÎÎŮČ"
 msgid "no copyright!\n"
 msgstr "ÎĹÔ ËĎĐÉŇÁĘÔÁ!\n"
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ×ĹŇÓÉŃ %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "íĎÖĹÔ Ó×ĎÂĎÄÎĎ ŇÁÓĐŇĎÓÔŇÁÎŃÔŘÓŃ ÎÁ ŐÓĚĎ×ÉŃČ GNU GPL."
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr ""
 "éÓĐĎĚŘÚĎ×ÁÎÉĹ:\n"
 "       rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <ËÁÔÁĚĎÇ>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <ËÁÔÁĚĎÇ>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <ËÁÔÁĚĎÇ>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <ËÁÔ.>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                        [--ftpproxy <host>] [--ftpport <ĐĎŇÔ>] [--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <host>] [--httpport <ĐĎŇÔ>]"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate oldpath=newpath]"
 
-#: rpm.c:235
+#: rpm.c:246
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <ĐŐÔŘ>]"
 
-#: rpm.c:236
+#: rpm.c:247
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] file1.rpm ... fileN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <ËÁÔÁĚĎÇ>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <ĆÁĘĚ>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <ËÁÔ.>] [--prefix <ËÁÔ.>] "
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <ĐĎŇÔ>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:245
+#: rpm.c:256
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <ĐŐÔŘ>] [--ignoresize]"
 
-#: rpm.c:246
+#: rpm.c:257
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        file1.rpm ... fileN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <ËÁÔÁĚĎÇ>] [--rcfile <ĆÁĘĚ>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:253
+#: rpm.c:264
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <ËÁÔÁĚĎÇ>] [ĂĹĚÉ]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <ËÁÔÁĚĎÇ>] [--rcfile <ĆÁĘĚ>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <ËÁÔ>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [ĂĹĚÉ]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [ĂĹĚŘ]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [ĂĹĚŘ]"
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        file1.rpm ... fileN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <ËÁÔÁĚĎÇ>] [--noscripts] [--rcfile <ĆÁĘĚ>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <ËÁÔÁĚĎÇ>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 "                        [--justdb] [--notriggers] package1 ... packageN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <ĆÁĘĚ>]"
 
-#: rpm.c:264
+#: rpm.c:275
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 
-#: rpm.c:265
+#: rpm.c:276
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=platform1[,platform2...]]"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] specfile"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "       rpm {--rmsource} [--rcfile <ĆÁĘĚ>] [-v] specfile"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <ĆÁĘĚ>] [-v] source1.rpm ... sourceN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <ĆÁĘĚ>] [-v] source1.rpm ... sourceN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <ĆÁĘĚ>] ĐÁËĹÔ1 ĐÁËĹÔ2 ... ĐÁËĹÔN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <ĆÁĘĚ>] ĐÁËĹÔ1 ĐÁËĹÔ2 ... ĐÁËĹÔN"
 
-#: rpm.c:272
+#: rpm.c:283
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <ĆÁĘĚ>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           ĐÁËĹÔ1 ... ĐÁËĹÔN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <ĆÁĘĚ>] [--dbpath <ËÁÔÁĚĎÇ>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÎÉĹ:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "×Ů×ĹÓÔÉ ÜÔĎ ÓĎĎÂÝĹÎÉĹ"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "×Ů×ĹÓÔÉ ×ĹŇÓÉŔ ÉÓĐĎĚŘÚŐĹÍĎÇĎ rpm"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   ×ÓĹ ŇĹÖÉÍŮ ĐĎÄÄĹŇÖÉ×ÁŔÔ ÓĚĹÄŐŔÝÉĹ ÁŇÇŐÍĹÎÔŮ:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
-msgstr "      --rcfile <ĆÁĘĚ>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
+msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ> ×ÍĹÓÔĎ /etc/rpmrc É $HOME/.rpmrc"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "ÂŮÔŘ ÎĹÍÎĎÇĎ ŇÁÚÇĎ×ĎŇŢÉ×ĹĹ"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    --pipe <cmd>          "
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "ÂŮÔŘ ďţĺîř ŇÁÚÇĎ×ĎŇŢÉ×ŮÍ (ÄĚŃ ĎÔĚÁÄËÉ)"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "×Ů×ĹÓÔÉ ×ĹŇÓÉŔ ÉÓĐĎĚŘÚŐĹÍĎÇĎ rpm"
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "ŇĹÖÉÍ ÚÁĐŇĎÓÁ"
+#: rpm.c:332
+msgid "    --pipe <cmd>          "
+msgstr "    --pipe <cmd>          "
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr "      --root <ËÁÔÁĚĎÇ>    "
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "ĐĎÓĚÁÔŘ ÓÔÁÎÄÁŇÔÎŮĘ ×Ů×ĎÄ × <cmd>"
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËĎŇÎĹ×ĎĘ ËÁÔÁĚĎÇ"
+#: rpm.c:334
+#, fuzzy
+msgid "    --rcfile <file>       "
+msgstr "      --rcfile <ĆÁĘĚ>     "
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
-msgstr "      --dbpath <ËÁÔÁĚĎÇ>  "
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ> ×ÍĹÓÔĎ /etc/rpmrc É $HOME/.rpmrc"
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËÁÔÁĚĎÇ ÄĚŃ ÂÁÚŮ ÄÁÎÎŮČ"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
+msgstr ""
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
-msgstr "      --queryformat <qfmt>"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "ÂŮÔŘ ÎĹÍÎĎÇĎ ŇÁÚÇĎ×ĎŇŢÉ×ĹĹ"
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <qfmt> ËÁË ĆĎŇÍÁÔ ČĹÄĹŇÁ (ĐĎÄŇÁÚŐÍĹ×ÁĹÔ -i)"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "ÂŮÔŘ ďţĺîř ŇÁÚÇĎ×ĎŇŢÉ×ŮÍ (ÄĚŃ ĎÔĚÁÄËÉ)"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   ŐÓÔÁÎĎ×ËÁ, ĎÂÎĎ×ĚĹÎÉĹ É ÚÁĐŇĎÓ (Ó -p) ÄĎĐŐÓËÁŔÔ ÉÓĐĎĚŘÚĎ×ÁÎÉĹ ftp URL "
 "×ÍĹÓÔĎ"
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr "   ÉÍĹÎ ĆÁĘĚĎ× Á ÔÁËÖĹ ÓĚĹÄŐŔÝÉĹ ĎĐĂÉÉ:"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <host>   "
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "ÉÍŃ ÉĚÉ IP-ÁÄŇĹÓ ftp proxy"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <ĐĎŇÔ>    "
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "ÎĎÍĹŇ ĐĎŇÔÁ ftp-ÓĹŇ×ĹŇÁ (ÉĚÉ proxy)"
 
-#: rpm.c:335
-msgid "      --httpproxy <host>   "
+#: rpm.c:350
+#, fuzzy
+msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <host>   "
 
-#: rpm.c:336
+#: rpm.c:351
 msgid "hostname or IP of http proxy"
 msgstr "ÉÍŃ ÉĚÉ IP-ÁÄŇĹÓ http proxy"
 
-#: rpm.c:337
-msgid "      --httpport <port>    "
+#: rpm.c:352
+#, fuzzy
+msgid "      --httpport <port>   "
 msgstr "      --httpport <ĐĎŇÔ>    "
 
-#: rpm.c:338
+#: rpm.c:353
 msgid "port number of http server (or proxy)"
 msgstr "ÎĎÍĹŇ ĐĎŇÔÁ http-ÓĹŇ×ĹŇÁ (ÉĚÉ proxy)"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "ŇĹÖÉÍ ÚÁĐŇĎÓÁ"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr "      --dbpath <ËÁÔÁĚĎÇ>  "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËÁÔÁĚĎÇ ÄĚŃ ÂÁÚŮ ÄÁÎÎŮČ"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr "      --queryformat <qfmt>"
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <qfmt> ËÁË ĆĎŇÍÁÔ ČĹÄĹŇÁ (ĐĎÄŇÁÚŐÍĹ×ÁĹÔ -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr "      --root <ËÁÔÁĚĎÇ>    "
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËĎŇÎĹ×ĎĘ ËÁÔÁĚĎÇ"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      ďĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ ĐÁËĹÔÁ:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "ÚÁĐŇĎÓÉÔŘ ×ÓĹ ĐÁËĹÔŮ"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr "        -f <ĆÁĘĚ>+        "
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "ÎÁĘÔÉ ĐÁËĹÔ, ËĎÔĎŇĎÍŐ ĐŇÉÎÁÄĚĹÖÉÔ <ĆÁĘĚ>"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr "        -p <ĆÁĘĚ ĐÁËĹÔÁ>+ "
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "ÚÁĐŇĎÓÉÔŘ (ÎĹŐÓÔÁÎĎ×ĚĹÎÎŮĘ) ĐÁËĹÔ <ĆÁĘĚ ĐÁËĹÔÁ>"
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pkg>"
 
-#: rpm.c:347
+#: rpm.c:372
 msgid "query packages triggered by <pkg>"
 msgstr "ÚÁĐŇĎÓÉÔŘ ĐÁËĹÔŮ Ó ÔŇÉÇÇĹŇ-ÓËŇÉĐÔÁÍÉ ÎÁ ĐÁËĹÔ <pkg>"
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <cap>"
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr "ÎÁĘÔÉ ĐÁËĹÔŮ, ĐŇĹÄĎÓÔÁ×ĚŃŔÝÉĹ ÓĹŇ×ÉÓ <cap>"
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <cap>"
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr "ÎÁĘÔÉ ĐÁËĹÔŮ, ÔŇĹÂŐŔÝÉĹ ÓĹŇ×ÉÓÁ <cap>"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      ďĐĂÉÉ ×ŮÂĎŇÁ ÉÎĆĎŇÍÁĂÉÉ:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "×Ů×ĹÓÔÉ ÉÎĆĎŇÍÁĂÉŔ Ď ĐÁËĹÔĹ"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "×Ů×ĹÓÔÉ ĐŇĎÔĎËĎĚ ÉÚÍĹÎĹÎÉĘ ĐÁËĹÔÁ"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "×Ů×ĹÓÔÉ ÓĐÉÓĎË ĆÁĘĚĎ× ĐÁËĹÔÁ"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "ĐĎËÁÚÁÔŘ ÓĎÓÔĎŃÎÉĹ ĆÁĘĚĎ× (ĐĎÄŇÁÚŐÍĹ×ÁĹÔ -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "×Ů×ĹÓÔÉ ÔĎĚŘËĎ ĆÁĘĚŮ ÄĎËŐÍĹÎÔÁĂÉÉ (ĐĎÄŇÁÚŐÍĹ×ÁĹÔ -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "×Ů×ĹÓÔÉ ÔĎĚŘËĎ ËĎÎĆÉÇŐŇÁĂÉĎÎÎŮĹ ĆÁĘĚŮ (ĐĎÄŇÁÚŐÍĹ×ÁĹÔ -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -605,35 +642,23 @@ msgstr ""
 "ĐĎËÁÚÁÔŘ ×ÓŔ ËĎÎÔŇĎĚŘÎŐŔ ÉÎĆĎŇÍÁĂÉŔ ÄĚŃ ËÁÖÄĎÇĎ ĆÁĘĚÁ (ÄĎĚÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘÓŃ "
 "Ó -l, -c ÉĚÉ -d)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "ĐĎËÁÚÁÔŘ ÓĹŇ×ÉÓŮ, ĐŇĹÄĎÓÔÁ×ĚŃĹÍŮĹ ĐÁËĹÔĎÍ"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr "        --requires"
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "ĐĎËÁÚÁÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "×Ů×ĹÓÔÉ ŇÁÚÎĎĎÂŇÁÚÎŮĹ [ÄĹ]ÉÎÓÔÁĚĚŃĂÉĎÎÎŮĹ ÓËŇÉĐÔŮ"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr "ĐĎËÁÚÁÔŘ ÔŇÉÇÇĹŇ-ÓËŇÉĐÔŮ, ÓĎÄĹŇÖÁÝÉĹÓŃ × ĐÁËĹÔĹ"
 
-#: rpm.c:379
-msgid "    --pipe <cmd>          "
-msgstr "    --pipe <cmd>          "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "ĐĎÓĚÁÔŘ ÓÔÁÎÄÁŇÔÎŮĘ ×Ů×ĎÄ × <cmd>"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -641,153 +666,142 @@ msgstr ""
 "×ĹŇÉĆÉĂÉŇĎ×ÁÔŘ ÉÎÓÔÁĚĚŃĂÉŔ ĐÁËĹÔÁ, ÉÓĐĎĚŘÚŐŃ ÔĹ ÖĹ ĎĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ "
 "ĐÁËĹÔÁ, ŢÔĎ É -q"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔĹĘ ĐÁËĹÔÁ"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ËĎÎÔŇĎĚŘÎŮĹ md5-ÓŐÍÍŮ ĆÁĘĚĎ×"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÁÔÔŇÉÂŐÔŮ ĆÁĘĚĎ×"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"ŐÓÔÁÎĎ×ÉÔŘ ĐŇÁ×Á ÄĎÓÔŐĐÁ ĆÁĘĚĎ× ÔÁËÉĹ ÖĹ, ËÁË × ÂÁÚĹ ÄÁÎÎŮČ ĐÁËĹÔÁ, "
-"ÉÓĐĎĚŘÚŐŃ ÔĹ ÖĹ ĎĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ ĐÁËĹÔÁ, ŢÔĎ É -q"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"ŐÓÔÁÎĎ×ÉÔŘ ČĎÚŃÉÎÁ É ÇŇŐĐĐŐ ĆÁĘĚĎ× ÔÁËÉĹ ÖĹ, ËÁË × ÂÁÚĹ ÄÁÎÎŮČ ĐÁËĹÔÁ, "
-"ÉÓĐĎĚŘÚŐŃ ÔĹ ÖĹ ĎĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ ĐÁËĹÔÁ, ŢÔĎ É -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "×Ů×ĹÓÔÉ ÔÜÇÉ, ËĎÔĎŇŮĹ ÍĎÇŐÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎŮ × ĆĎŇÍÁÔĹ ÚÁĐŇĎÓÁ"
 
-#: rpm.c:402
+#: rpm.c:418
 msgid "    --install <packagefile>"
 msgstr "    --install <ĆÁĘĚ ĐÁËĹÔÁ>"
 
-#: rpm.c:403
+#: rpm.c:419
 msgid "    -i <packagefile>      "
 msgstr "    -i <ĆÁĘĚ ĐÁËĹÔÁ>      "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "ŐÓÔÁÎĎ×ÉÔŘ ĐÁËĹÔ"
 
-#: rpm.c:405
+#: rpm.c:421
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <ĐŐÔŘ>"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ × ĐŐÔÉ <ĐŐÔŘ>"
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <oldpath>=<newpath>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ ÉÚ <oldpath> × <newpath>"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ ÎĹ×ÚÉŇÁŃ ÎÁ ÔĎ, ŢÔĎ ĐÁËĹÔ ÜÔĎÇĎ ÎĹ ĐĎÚ×ĎĚŃĹÔ"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "ĐŐÔŘ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ ÄĚŃ ĐÁËĹÔÁ %s-%s-%s"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <ËÁÔÁĚĎÇ>  "
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĐÁËĹÔ × <ËÁÔÁĚĎÇ>, ĹÓĚÉ ĐÁËĹÔ ÜÔĎ ĐĎÚ×ĎĚŃĹÔ"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "ÎĹ ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ÄĎËŐÍĹÎÔÁĂÉŔ"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "ÓĎËŇÁÝĹÎÉĹ ÄĚŃ --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "×Ů×ĎÄÉÔŘ \"#\" ĐĎ ÍĹŇĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ (ČĎŇĎŰĎ Ó -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ÷óĺ ĆÁĘĚŮ, ÄÁÖĹ ËĎÎĆÉÇŐŇÁĂÉĎÎÎŮĹ, ËĎÔĎŇŮĹ ÍĎÇĚÉ ÂŮ ÂŮÔŘ "
 "ĐŇĎĐŐÝĹÎŮ"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÁŇČÉÔĹËÔŐŇŐ ĐÁËĹÔÁ"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÄÉÓËĎ×ĎĹ ĐŇĎÓÔŇÁÎÓÔ×Ď ĐĹŇĹÄ ŐÓÔÁÎĎ×ËĎĘ"
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĎĐĹŇÁĂÉĎÎÎŐŔ ÓÉÓÔĹÍŐ ĐÁËĹÔÁ"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "ŐÓÔÁÎĎ×ÉÔŘ ÄĎËŐÍĹÎÔÁĂÉŔ"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "ĎÂÎĎ×ÉÔŘ ÂÁÚŐ ÄÁÎÎŮČ, ÎĎ ÎĹ ÍĎÄÉĆÉĂÉŇĎ×ÁÔŘ ĆÁĘĚĎ×ŐŔ ÓÉÓÔĹÍŐ"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ÎĹ ÍĹÎŃÔŘ ĐĎŇŃÄĎË ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔĎ× ÄĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÚÁ×ÉÓÉÍĎÓÔĹĘ"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ËÁËÉČ-ĚÉÂĎ ŐÓÔÁÎĎ×ĎŢÎŮČ ÓËŇÉĐÔĎ×"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÔŇÉÇÇĹŇ-ÓËŇÉĐÔĎ×, ×Ú×ĹÄĹÎÎŮČ ÎÁ ÜÔĎÔ ĐÁËĹÔ"
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "×Ů×ĎÄÉÔŘ ĐŇĎĂĹÎÔ ÇĎÔĎ×ÎĎÓÔÉ ĐĎ ÍĹŇĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ÄÁÖĹ ĹÓĚÉ ĐÁËĹÔ ĐĹŇĹĐÉŰĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎÎŮĹ ĆÁĘĚŮ"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "ĐĹŇĹŐÓÔÁÎĎ×ÉÔŘ ĹÓĚÉ ĐÁËĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "ÎĹ ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ, Á ÔĎĚŘËĎ ÓĎĎÂÝÉÔŘ ŐÄÁÓÔÓŃ ĚÉ ŐÓÔÁÎĎ×ËÁ"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <ĆÁĘĚ ĐÁËĹÔÁ>"
 
-#: rpm.c:455
+#: rpm.c:471
 msgid "    -U <packagefile>      "
 msgstr "    -U <ĆÁĘĚ ĐÁËĹÔÁ>      "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "ĎÂÎĎ×ĚĹÎÉĹ ĐÁËĹÔÁ (ÔĹ ÖĹ ĎĐĂÉÉ, ŢÔĎ É Ó --install, ĐĚŔÓ)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -795,15 +809,15 @@ msgstr ""
 "ĎÔËÁÔ ÎÁ ÂĎĚĹĹ ÓÔÁŇŐŔ ×ĹŇÓÉŔ ĐÁËĹÔÁ (--force ÄĚŃ ĎÂÎĎ×ĚĹÎÉŃ ÄĹĚÁĹÔ ÜÔĎ "
 "Á×ÔĎÍÁÔÉŢĹÓËÉ)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr "    --erase <ĐÁËĹÔ>  "
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "ŐÄÁĚÉÔŘ (ÄĹÉÎÓÔÁĚĚÉŇĎ×ÁÔŘ) ĐÁËĹÔ"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -811,89 +825,90 @@ msgstr ""
 "ŐÄÁĚÉÔŘ ×ÓĹ ĐÁËĹÔŮ, ÓĎ×ĐÁÄÁŔÝÉĹ Ó <ĐÁËĹÔ> (ĎÂŮŢÎĎ, ĹÓĚÉ <ĐÁËĹÔ> "
 "ÓĎĎÔ×ĹÔÓÔ×ŐĹÔ ÎĹÓËĎĚŘËÉÍ ĐÁËĹÔÁÍ, ÇĹÎĹŇÉŇŐĹÔÓŃ ĎŰÉÂËÁ)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÓËŇÉĐÔĎ×, ÓĐĹĂÉĆÉŢÎŮČ ÄĚŃ ĐÁËĹÔÁ"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<stage> <spec>      "
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<stage> <tarball>   "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "ÓĎÂŇÁÔŘ ĐÁËĹÔ, ÇÄĹ <stage> - ĎÄÎĎ ÉÚ:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (ÉÓĐĎĚÎÉÔŘ %prep)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "list check (ĐŇĎÉÚ×ĹÓÔÉ ĐŇĎ×ĹŇËŐ ÓĹËĂÉÉ %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "compile (ÉÓĐĎĚÎÉÔŘ %prep É %build)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "install (ÉÓĐĎĚÎÉÔŘ %prep, %build É %install)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "binary package (ÉÓĐĎĚÎÉÔŘ %prep, %build, %install É ÓĎÚÄÁÔŘ RPM)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "bin/src package (ÉÓĐĎĚÎÉÔŘ %prep, %build, %install, ÓĎÚÄÁÔŘ RPM É SRPM)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
-msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ ÄĹŇĹ×Ď ÉÓČĎÄÎÉËĎ× É spec-ĆÁĘĚ"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
+msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ spec-ĆÁĘĚ"
 
-#: rpm.c:502
+#: rpm.c:520
 msgid "generate PGP/GPG signature"
 msgstr "ÇĹÎĹŇÉŇĎ×ÁÔŘ PGP/GPG-ĐĎÄĐÉÓŘ"
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <ËÁÔ.>  "
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔ.> ËÁË ËĎŇÎĹ×ĎĘ ÄĚŃ ĐĎÓÔŇĎĹÎÉŃ ĐÁËĹÔÁ"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr "      --target=<ĐĚÁÔĆĎŇÍÁ>+"
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "ĐĎÓÔŇĎÉÔŘ ĐÁËĹÔŮ ÄĚŃ ĂĹĚĹ×ŮČ ĐĚÁÔĆĎŇÍ ĐĚÁÔĆĎŇÍÁ1...ĐĚÁÔĆĎŇÍÁN"
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÜÔÁĐĎ×"
 
-#: rpm.c:509
+#: rpm.c:527
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <secs>  "
 
-#: rpm.c:510
+#: rpm.c:528
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "ŐÓÔÁÎĎ×ÉÔŘ ĐŇĎ×ĹŇËŐ ×ŇĹÍĹÎÉ × <secs> ÓĹËŐÎÄ (0 ĎÔÍĹÎŃĹÔ ĹĹ)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <src_pkg>   "
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -901,229 +916,239 @@ msgstr ""
 "ŐÓÔÁÎĎ×ÉÔŘ SRPM, ÓĎÂŇÁÔŘ RPM É ŐÄÁĚÉÔŘ spec-ĆÁĘĚ, ĆÁĘĚŮ Ó ÉÓČĎÄÎŮÍÉ "
 "ÔĹËÓÔÁÍÉ, ĐÁÔŢÉ É ĐÉËÔĎÇŇÁÍÍŮ."
 
-#: rpm.c:514
-msgid "    --rmsource <spec>     "
-msgstr "    --rmsource <spec>     "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "ŐÄÁĚÉÔŘ ÉÓČĎÄÎÉËÉ É spec-ĆÁĘĚ"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <src_pkg> "
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "ËÁË --rebuild, ÎĎ ÎĹ ÓĎÂÉŇÁĹÔ ÎÉËÁËÉČ ĐÁËĹÔĎ×"
 
-#: rpm.c:518
+#: rpm.c:536
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pkg>+       "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "ĐĎÄĐÉÓÁÔŘ ĐÁËĹÔ (ŐÄÁĚÉ× ÔĹËŐÝŐŔ ĐĎÄĐÉÓŘ)"
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pkg>+      "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "ÄĎÂÁ×ÉÔŘ ĐĎÄĐÉÓŘ Ë ĐÁËĹÔŐ"
 
-#: rpm.c:523
-msgid "    --checksig <pkg>+     "
+#: rpm.c:540
+#, fuzzy
+msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pkg>+     "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    --resign <pkg>+       "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ×ÓĹ PGP-ĐĎÄĐÉÓÉ"
 
-#: rpm.c:528
+#: rpm.c:546
 msgid "skip any GPG signatures"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ×ÓĹ GPG-ĐĎÄĐÉÓÉ"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ×ÓĹ MD5-ĐĎÄĐÉÓÉ"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "×Ů×ĹÓÔÉ ÔÜÇÉ, ËĎÔĎŇŮĹ ÍĎÇŐÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎŮ × ĆĎŇÍÁÔĹ ÚÁĐŇĎÓÁ"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "ŐÂĹÄÉÔŘÓŃ, ŢÔĎ ÓŐÝĹÓÔ×ŐĹÔ ĐŇÁ×ÉĚŘÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "ĐĹŇĹÓÔŇĎÉÔŘ ÂÁÚŐ ÄÁÎÎŮČ ÉÚ ÓŐÝĹÓÔ×ŐŔÝĹĘ ÂÁÚŮ"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"ŐÓÔÁÎĎ×ÉÔŘ ĐŇÁ×Á ÄĎÓÔŐĐÁ ĆÁĘĚĎ× ÔÁËÉĹ ÖĹ, ËÁË × ÂÁÚĹ ÄÁÎÎŮČ ĐÁËĹÔÁ, "
+"ÉÓĐĎĚŘÚŐŃ ÔĹ ÖĹ ĎĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ ĐÁËĹÔÁ, ŢÔĎ É -q"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"ŐÓÔÁÎĎ×ÉÔŘ ČĎÚŃÉÎÁ É ÇŇŐĐĐŐ ĆÁĘĚĎ× ÔÁËÉĹ ÖĹ, ËÁË × ÂÁÚĹ ÄÁÎÎŮČ ĐÁËĹÔÁ, "
+"ÉÓĐĎĚŘÚŐŃ ÔĹ ÖĹ ĎĐĂÉÉ ÓĐĹĂÉĆÉËÁĂÉÉ ĐÁËĹÔÁ, ŢÔĎ É -q"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ĎÓÎĎ×ÎŮČ ŇĹÖÉÍĎ×"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "ĎĐĂÉÉ -u É --uninstall ŐÓÔÁŇĹĚÉ É ÂĎĚŘŰĹ ÎĹ ŇÁÂĎÔÁŔÔ.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "÷ÍĹÓÔĎ ÎÉČ ÉÓĐĎĚŘÚŐĘÔĹ -e ÉĚÉ --erase.\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "ĎĐĂÉŃ --build (-b) ÔŇĹÂŐĹÔ a,b,i,c,p,l × ËÁŢĹÓÔ×Ĺ ĹÄÉÎÓÔ×ĹÎÎĎÇĎ ÁŇÇŐÍĹÎÔÁ"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "ĎĐĂÉŃ --tarbuild (-t) ÔŇĹÂŐĹÔ a,b,i,c,p,l × ËÁŢĹÓÔ×Ĺ ĹÄÉÎÓÔ×ĹÎÎĎÇĎ ÁŇÇŐÍĹÎÔÁ"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "ÚÁ ĎÄÉÎ ŇÁÚ ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚÎĹÎ ÔĎĚŘËĎ ĎÄÉÎ ÔÉĐ ĐŇĎ×ĹŇËÉ ÉĚÉ ÚÁĐŇĎÓÁ"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --dbpath ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÓĎÄĹŇÖÁÔŘ ="
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÉÍĹÔŘ / ĐĎÓĚĹ ="
 
-#: rpm.c:897
+#: rpm.c:932
 msgid "exclude paths must begin with a /"
 msgstr "ÉÓËĚŔŢĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ ĐŇÉ ĎÂŇÁÂĎÔËĹ ÁŇÇŐÍĹÎÔĎ× (%d) :-(\n"
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "ĎĐĂÉŃ --dbpath ÚÁÄÁÎÁ ÄĚŃ ĎĐĹŇÁĂÉÉ, ÎĹ ÉÓĐĎĚŘÚŐŔÝĹĘ ÂÁÚŐ ÄÁÎÎŮČ"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "ĎĐĂÉŃ --timecheck ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ ĐÁËĹÔĎ×"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ÉÓÔĎŢÎÉË ÚÁĐŇĎÓÁ"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ÉÓÔĎŢÎÉË ÚÁĐŇĎÓÁ"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ÉÓÔĎŢÎÉË ÚÁĐŇĎÓÁ"
 
-#: rpm.c:976
+#: rpm.c:1013
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "ĐŇÉÎŐÄÉÔĹĚŘÎŮÍÉ ÍĎÇŐÔ ÂŮÔŘ ÔĎĚŘËĎ ŐÓÔÁÎĎ×ËÁ, ĎÂÎĎ×ĚĹÎÉĹ, ŐÄÁĚĹÎÉĹ ÉÓČĎÄÎÉËĎ× "
 "É spec-ĆÁĘĚÁ"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "ĆÁĘĚŮ ÍĎÇŐÔ ÂŮÔŘ ĐĹŇĹÍĹÝĹÎŮ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĎÄÎÁ ÉÚ ĎĐĂÉĘ --prefix ÉĚÉ --relocate"
 
-#: rpm.c:985
+#: rpm.c:1022
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "ĎĐĂÉÉ --relocate É --excludepath ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ "
 "ÎĎ×ŮČ ĐÁËĹÔĎ×"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "ĎĐĂÉŔ --prefix ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÎĎ×ŮČ ĐÁËĹÔĎ×"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --prefix ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --hash (-h) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --percent ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --replacefiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --replacepkgs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --excludedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --includedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĎÄÎÁ ÉÚ ĎĐĂÉĘ --excludedocs ÉĚÉ --includedocs"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --ignorearch ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --ignoreos ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1030
+#: rpm.c:1067
 msgid "--ignoresize may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --ignoresize ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "ĎĐĂÉŃ --allmatches ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "ĎĐĂÉŃ --allfiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "ĎĐĂÉŃ --justdb ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1131,7 +1156,7 @@ msgstr ""
 "ĎĐĂÉŃ --noscripts ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É "
 "×ĹŇÉĆÉËÁĂÉÉ ĐÁËĹÔÁ"
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1139,7 +1164,7 @@ msgstr ""
 "ĎĐĂÉŃ --notriggers ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É "
 "×ĹŇÉĆÉËÁĂÉÉ ĐÁËĹÔÁ"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1148,7 +1173,7 @@ msgstr ""
 "ĎĐĂÉŃ --nodeps ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ, ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É "
 "×ĹŇÉĆÉËÁĂÉÉ ĐÁËĹÔĎ×"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1156,7 +1181,7 @@ msgstr ""
 "ĎĐĂÉŃ --test ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É ÓÂĎŇËĹ "
 "ĐÁËĹÔÁ"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1164,126 +1189,126 @@ msgstr ""
 "ĎĐĂÉŃ --root (-r) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ, "
 "ÚÁĐŇĎÓÁČ ĐÁËĹÔÁ É ĐĹŇĹÓÔŇĎĹÎÉÉ ÂÁÚŮ ÄÁÎÎŮČ"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --root (-r) ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 "ĎĐĂÉŃ --oldpackage ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ĐÁËĹÔĎ×"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "ĎĐĂÉÉ ftp ÍĎÇŐÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎŮ ÔĎĚŘËĎ ĐŇÉ ÚÁĐŇĎÓÁČ, ŐÓÔÁÎĎ×ËĹ É "
 "ĎÂÎĎ×ĚĹÎÉÉ ĐÁËĹÔĎ×"
 
-#: rpm.c:1093
+#: rpm.c:1131
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "ĎĐĂÉÉ http ÍĎÇŐÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎŮ ÔĎĚŘËĎ ĐŇÉ ÚÁĐŇĎÓÁČ, ŐÓÔÁÎĎ×ËĹ É "
 "ĎÂÎĎ×ĚĹÎÉÉ ĐÁËĹÔĎ×"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "ĎĐĂÉŃ --nopgp ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ĐŇĎ×ĹŇËĹ ĐĎÄĐÉÓÉ"
 
-#: rpm.c:1100
+#: rpm.c:1139
 msgid "--nogpg may only be used during signature checking"
 msgstr "ĎĐĂÉŃ --nogpg ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ĐŇĎ×ĹŇËĹ ĐĎÄĐÉÓÉ"
 
-#: rpm.c:1103
+#: rpm.c:1142
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "ĎĐĂÉŃ --nomd5 ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ĐŇĎ×ĹŇËĹ ĐĎÄĐÉÓÉ É "
 "×ĹŇÉĆÉËÁĂÉÉ ĐÁËĹÔÁ"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "ÎĹÔ ÄĎÓÔŐĐÁ Ë ĆÁĘĚŐ %s\n"
 
-#: rpm.c:1151
+#: rpm.c:1192
 msgid "pgp not found: "
 msgstr "pgp ÎĹ ÎÁĘÄĹÎ: "
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr "÷×ĹÄÉÔĹ ĐÁŇĎĚŘ: "
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "îĹ×ĹŇÎŮĘ ĐÁŇĎĚŘ\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "đÁŇĎĚŘ ĐŇÉÎŃÔ.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ %%_signature × ÍÁËŇĎĆÁĘĚĹ.\n"
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "ĎĐĂÉŃ --sign ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÁ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ ĐÁËĹÔĎ×"
 
-#: rpm.c:1186
+#: rpm.c:1227
 msgid "exec failed\n"
 msgstr "ÚÁĐŐÓË ÎĹ ŐÄÁĚÓŃ\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ÁŇÇŐÍĹÎÔŮ ÄĚŃ --querytags "
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐŇĎ×ĹŇËÉ ĐĎÄĐÉÓÉ"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĎÄĐÉÓÉ"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĹŇĹÓÂĎŇËÉ"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "ÎĹ ÚÁÄÁÎ spec-ĆÁĘĚ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "ÎĹ ÚÁÄÁÎŮ tar-ĆÁĘĚŮ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "× ÚÁĐŇĎÓĹ ËĎ ×ÓĹÍ ĐÁËĹÔÁÍ ÚÁÄÁÎŮ ĚÉŰÎÉĹ ÁŇÇŐÍĹÎÔŮ"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ"
 
-#: rpm.c:1415
+#: rpm.c:1456
 msgid "extra arguments given for verify of all packages"
 msgstr "× ÚÁĐŇĎÓĹ ×ĹŇÉĆÉËÁĂÉÉ ×ÓĹČ ĐÁËĹÔĎ× ÚÁÄÁÎŮ ĚÉŰÎÉĹ ÁŇÇŐÍĹÎÔŮ"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÄĚŃ ×ĹŇÉĆÉËÁĂÉÉ"
 
@@ -3629,6 +3654,21 @@ msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "îĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ ÄĚŃ %s-%s-%s: "
 
+#~ msgid "        --requires"
+#~ msgstr "        --requires"
+
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ ÎĹ×ÚÉŇÁŃ ÎÁ ÔĎ, ŢÔĎ ĐÁËĹÔ ÜÔĎÇĎ ÎĹ ĐĎÚ×ĎĚŃĹÔ"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "ĐĎÓĚĹ ÚÁ×ĹŇŰĹÎÉŃ ŐÄÁĚÉÔŘ ÄĹŇĹ×Ď ÉÓČĎÄÎÉËĎ× É spec-ĆÁĘĚ"
+
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    --rmsource <spec>     "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "ŐÄÁĚÉÔŘ ÉÓČĎÄÎÉËÉ É spec-ĆÁĘĚ"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
diff --git a/po/sk.po b/po/sk.po
index 01e4531f2..2fff62e4d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -85,7 +85,7 @@ msgstr "predefinovať operačný systém balíka"
 msgid "override build root"
 msgstr "predefinovať adresár pre zostavenie balíka"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "po ukončení odstrániť adresár, v ktorom sa balík zostavoval"
 
@@ -97,7 +97,7 @@ msgstr "nevykonať žiadne etapy zostavenia"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "neakceptovať lokalizované reťazce zo spec-súboru"
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "po ukončení odstrániť zdrojové súbory a spec-súbor"
@@ -107,7 +107,7 @@ msgstr "po ukončení odstrániť zdrojové súbory a spec-súbor"
 msgid "remove specfile when done"
 msgstr "po ukončení odstrániť zdrojové súbory a spec-súbor"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "preskočiť priamo k určenej etape (iba pre c, i)"
 
@@ -161,455 +161,492 @@ msgstr "balík nebol nájdený v databáze"
 msgid "no copyright!\n"
 msgstr "žiadny copyright!\n"
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzia %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Program môže byť voľne redistribuovaný v súlade s podmienkami GNU GPL"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "použitie: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr "          rpm {--version}"
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "          rpm {--initdb}   [--dbpath <adresár>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "          rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                           [--replacepkgs] [--replacefiles] [--root "
 "<adresár>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 "                           [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                           [--rcfile <súbor>] [--ignorearch] [--dbpath "
 "<adresár>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                           [--prefix <adresár>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                           [--ftpproxy <počítač>] [--ftpport <port>] "
 "[--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                           [--httproxy <počítač>] [--httpport <port>]"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                           [--noorder] [--relocate stará_cesta=nová_cesta]"
 
-#: rpm.c:235
+#: rpm.c:246
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                           [--badreloc] [--notriggers] [--excludepath <path>]"
 
-#: rpm.c:236
+#: rpm.c:247
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                           [--ignoresize] súbor1.rpm ... súborN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "          rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                           [--oldpackage] [--root <adresár>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                           [--excludedocs] [--includedocs] [--rcfile <súbor>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                           [--ignorearch]  [--dbpath <adresár>] [--prefix "
 "<adresár>] "
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                           [--ftpproxy <počítač>] [--ftpport <port>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                           [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:245
+#: rpm.c:256
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                           [--badreloc] [--excludepath <path>] [--ignoresize]"
 
-#: rpm.c:246
+#: rpm.c:257
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                           súbor1.rpm ... súborN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "          rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                           [--scripts] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 "                           [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 "                           [--triggeredby] [--ftpuseport] [--ftpproxy "
 "<počítač>]"
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 "                           [--ftpport <port>] [--provides] [--triggers] "
 "[--dump]"
 
-#: rpm.c:253
+#: rpm.c:264
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 "                           [--changelog] [--dbpath <adresár>] [targets]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "          rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                           [--dbpath <adresár>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                           [--nomd5] [ciele]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "          rpm {--setperms} [-afpg] [cieľ]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "          rpm {--setugids} [-afpg] [cieľ]"
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                           súbor1.rpm ... súborN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "          rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
 "<súbor>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 "                           [--dbpath <adresár>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "                           [--justdb] [--notriggers] balík1 ... balíkN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "          rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<súbor>]"
 
-#: rpm.c:264
+#: rpm.c:275
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr "                           [--sign] [--nobuild] [--timecheck <s>] ]"
 
-#: rpm.c:265
+#: rpm.c:276
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                           [--target=platform1[,platform2...]]"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                           [--rmsource] specsúbor"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "          rpm {--rmsource} [--rcfile <súbor>] [-v] specsúbor"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "          rpm {--rebuild}  [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "          rpm {--recompile} [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "          rpm {--resign}   [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "          rpm {--addsign}  [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
-#: rpm.c:272
+#: rpm.c:283
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "          rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<súbor>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                              balík1 ... balíkN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "          rpm {--rebuilddb} [--rcfile <súbor>] [--dbpath <adresár>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr "          rpm {--querytags}"
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "použitie:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "vypísať túto správu"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "vypísať verziu používaného rpm"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   všetky režimy podporujú nasledovné argumenty:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
-msgstr "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
+msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "použiť <súbor> namiesto /etc/rpmrc a $HOME/.rpmrc"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "o niečo popisnejší režim"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    --pipe <príkaz>       "
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "veľmi popisný režim (pre odlaďovanie)"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "vypísať verziu používaného rpm"
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "režim otázok"
+#: rpm.c:332
+msgid "    --pipe <cmd>          "
+msgstr "    --pipe <príkaz>       "
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr "      --root <dir>        "
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "poslať štandardný výstup do <príkazu>"
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "použiť <adresár> ako adresár najvyššej úrovne"
+#: rpm.c:334
+#, fuzzy
+msgid "    --rcfile <file>       "
+msgstr "      --rcfile <file>     "
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
-msgstr "      --dbpath <dir>      "
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "použiť <súbor> namiesto /etc/rpmrc a $HOME/.rpmrc"
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "použiť <adresár> ako adresár pre databázu"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
+msgstr ""
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
-msgstr "      --queryformat <qfmt>"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "o niečo popisnejší režim"
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "použiť <qfmt> ako hlavičkový formát (implikuje -i)"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "veľmi popisný režim (pre odlaďovanie)"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr "   inštalácia, aktualizácia a otázky (s -p) umožňujú použiť ftp URL"
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr "   namiesto názvov súborov, ako aj nasledujúce voľby:"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <počítač>"
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "názov počítača alebo IP adresa ftp proxy"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "číslo portu ftp servera (alebo proxy)"
 
-#: rpm.c:335
-msgid "      --httpproxy <host>   "
+#: rpm.c:350
+#, fuzzy
+msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <počítač>"
 
-#: rpm.c:336
+#: rpm.c:351
 msgid "hostname or IP of http proxy"
 msgstr "názov počítača alebo IP adresa http proxy"
 
-#: rpm.c:337
-msgid "      --httpport <port>    "
+#: rpm.c:352
+#, fuzzy
+msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:338
+#: rpm.c:353
 msgid "port number of http server (or proxy)"
 msgstr "číslo portu http servera (alebo proxy)"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "režim otázok"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr "      --dbpath <dir>      "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "použiť <adresár> ako adresár pre databázu"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr "      --queryformat <qfmt>"
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "použiť <qfmt> ako hlavičkový formát (implikuje -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr "      --root <dir>        "
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "použiť <adresár> ako adresár najvyššej úrovne"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Voľby pre špecifikáciu balíkov"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "opýtať sa na všetky balíky"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr "        -f <súbor>+       "
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "opýtať sa na balík vlastniaci <súbor>"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr "        -p <súbor_balíku>+"
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "opýtať sa (nenainštalovaného) balíku <súbor_balíku>"
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <balík>"
 
-#: rpm.c:347
+#: rpm.c:372
 msgid "query packages triggered by <pkg>"
 msgstr "opýtať sa na balíky spustené balíkom <balík>"
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <schopnosť>"
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr "opýtať sa na balíky poskytujúce schopnosť <schopnosť>"
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <schopnosť>"
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr "opýtať sa na balíky vyžadujúce schopnosť <schopnosť>"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Voľby pre výber požadovanej informácie:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "zobraziť informácie o balíku"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "zobraziť históriu zmien balíka"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "zobraziť zoznam súborov balíka"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "zobraziť stavy súborov (implikuje -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "zobraziť len súbory obsahujúce dokumentáciu (implikuje -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "zobraziť iba konfiguračné súbory (implikuje -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -617,35 +654,23 @@ msgstr ""
 "zobraziť všetky overiteľné údaje pre každý súbor (musí byť použité s -l, -c "
 "alebo -d)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "zobraziť schopnosti poskytované balíkom"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr "        --requires"
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "zobraziť závislosti balíka"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "vypísať rôzne [od]inštalačné skripty"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr "zobraziť spúšťacie skripty obsiahnuté v balíku"
 
-#: rpm.c:379
-msgid "    --pipe <cmd>          "
-msgstr "    --pipe <príkaz>       "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "poslať štandardný výstup do <príkazu>"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -653,153 +678,142 @@ msgstr ""
 "overiť inštaláciu balíka s použitím rovnakých volieb špecifikácia balíka ako "
 "pre -q"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "neoverovať závislosti balíka"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "neoverovať md5 kontrolné súčty súborov"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "neoverovať atribúty súborov"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"nastaviť prístupové práva súborov podľa údajov v databáze balíkov s použitím "
-"rovnakých volieb špecifikácia balíka ako pre -q"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"nastaviť vlastníka a skupinu súborov podľa údajov v databáze balíkov s "
-"použitím rovnakých volieb špecifikácia balíka ako pre -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "vypísať príznaky, ktoré môžu byť použité vo formáte otázky"
 
-#: rpm.c:402
+#: rpm.c:418
 msgid "    --install <packagefile>"
 msgstr "    --install <súbor_balíku>"
 
-#: rpm.c:403
+#: rpm.c:419
 msgid "    -i <packagefile>      "
 msgstr "    -i <súbor_balíku>      "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "inštalovať balík"
 
-#: rpm.c:405
+#: rpm.c:421
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <cesta>"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr "vynechať súbory v ceste <cesta>"
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "presunúť súbory zo <starej_cesty> do <novej_cesty>"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "presunúť súbory napriek tomu, že to balík nedovoľuje"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "balík %s nie je nainštalovaný\n"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <adresár>  "
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "presunúť balík do <adresára>, pokiaľ to balík povoľuje"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "neinštalovať dokumentáciu"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skratka pre --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "vypisovať značky počas inštalácie balíka (vhodné s -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "inštalovať všetky súbory vrátane konfiguračných súborov, ktoré by inak mohli "
 "byť vynechané"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "neoverovať architektúru balíka"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr "pred inštaláciou nekontrolovať dostupné miesto na disku"
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "neoverovať operačný systém balíka"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "inštalovať dokumentáciu"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "aktualizovať databázu bez zmeny súborového systému"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nemeniť poradie balíkov kvôli vyriešeniu závislostí"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "nevykonať žiadne inštalačné skripty"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr "nevykonať žiadne skripty spúšťané týmto balíkom"
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "vypisovať percentá počas inštalácie balíka"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "inštalovať aj pokiaľ balík prepíše inštalované súbory"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "preinštalovať, pokiaľ už balík existuje"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "neinštalovať, ale oznámiť, či by to bolo možné"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <súbor_balíka>"
 
-#: rpm.c:455
+#: rpm.c:471
 msgid "    -U <packagefile>      "
 msgstr "    -U <súbor_balíka>     "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "aktualizovať balík (rovnaké voľby ako --install, a k tomu)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -807,15 +821,15 @@ msgstr ""
 "aktualizovať na staršiu verziu balíka (--force to pri aktualizácii urobí "
 "automaticky)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr "    --erase <package>"
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "odinštalovať balík"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -823,88 +837,89 @@ msgstr ""
 "odinštalovať všetky balíky určené <balíkom> (inak je chybou, pokiaľ <balík> "
 "špecifikuje viac ako jeden balík)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "nevykonať žiadne skripty špecifikované balíkom"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<etapa> <spec>      "
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etapa> <tar_súbor> "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "zostaviť balík, kde <etapa> je jedna z:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "príprava (rozbaliť zdrojové súbory a aplikovať záplaty)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrola zoznamu (vykonať niektoré zbežné kontroly sekcie %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "kompilácia (príprava a kompilácia)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "inštalácia (príprava, kompilácia, inštalácia)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "binárny balík (príprava, kompilácia, inštalácia, zabalenie)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "binárny a zdrojový balík (príprava, kompilácia, inštalácia, zabalenie)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
 msgstr "po ukončení odstrániť zdrojové súbory a spec-súbor"
 
-#: rpm.c:502
+#: rpm.c:520
 msgid "generate PGP/GPG signature"
 msgstr "vytvoriť PGP/GPG podpis"
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <adresár>   "
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "použiť <adresár> pre zostavenie balíka"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr "      --target=<platforma>+"
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "vytvoriť balíky pre ciele platforma1...platformaN."
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "nevykonať žiadne etapy"
 
-#: rpm.c:509
+#: rpm.c:527
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sekúnd>"
 
-#: rpm.c:510
+#: rpm.c:528
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "nastaviť kontrolu času na <sekúnd> sekúnd (0 pre deaktiváciu)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <zdroj_balík>"
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -912,224 +927,234 @@ msgstr ""
 "inštalovať zdrojový balík, vytvoriť binárny balík a odstrániť spec-súbor, "
 "zdroje, záplaty a ikony"
 
-#: rpm.c:514
-msgid "    --rmsource <spec>     "
-msgstr "    --rmsource <spec>     "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "odstrániť zdroje a spec-súbor"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <src_pkg> "
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "ako --rebuild, ale nezostaviť žiadny balík"
 
-#: rpm.c:518
+#: rpm.c:536
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <balík>+     "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "podpísať balík (zničiť aktuálny podpis)"
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <balík>+    "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "pridať podpis balíku"
 
-#: rpm.c:523
-msgid "    --checksig <pkg>+     "
+#: rpm.c:540
+#, fuzzy
+msgid "    --checksig <pkg>+"
 msgstr "    --checksig <balík>+   "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    --resign <balík>+     "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "overiť podpis balíka"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "vynechať akékoľvek PGP podpisy"
 
-#: rpm.c:528
+#: rpm.c:546
 msgid "skip any GPG signatures"
 msgstr "vynechať akékoľvek GPG podpisy"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "vynechať akékoľvek MD5 podpisy"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "vypísať príznaky, ktoré môžu byť použité vo formáte otázky"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "uistiť sa, že existuje platná databáza"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "znovu vytvoriť databázu z existujúcej"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"nastaviť prístupové práva súborov podľa údajov v databáze balíkov s použitím "
+"rovnakých volieb špecifikácia balíka ako pre -q"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"nastaviť vlastníka a skupinu súborov podľa údajov v databáze balíkov s "
+"použitím rovnakých volieb špecifikácia balíka ako pre -q"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "môže byť použitý iba jeden hlavný režim"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u a --uninstall sú zastaralé a už nefungujú.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Namiesto nich použite -e alebo --erase.\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) vyžaduje jedno z a,b,i,c,p,l ako jediný argument"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--tarbuild (-t) vyžaduje jedno z a,b,i,c,p,l ako jediný argument"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "naraz môže byť vykonaný jeden typ otázky alebo overenia"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "argumenty pre --dbpath musia začínať /"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "presunutia musia začínať znakom /"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "presunutia musia obsahovať znak ="
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "presunutia musia mať za znakom = znak /"
 
-#: rpm.c:897
+#: rpm.c:932
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musia začínať znakom /"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath zadané pre operáciu nepoužívajúcu databázu"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck môže byť použité iba pri zostavovaní balíka"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, 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é"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "súbory môžu byť presunuté iba počas inčtalácie balíka"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "može byť použitá iba jedna z volieb --prefix a --relocate"
 
-#: rpm.c:985
+#: rpm.c:1022
 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"
 
-#: rpm.c:988
+#: rpm.c:1025
 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"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pre --prefix musia začínať znakom /"
 
-#: rpm.c:994
+#: rpm.c:1031
 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"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "môže byť použitá iba jedna voľba z --excludedocs a --includedocs"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1030
+#: rpm.c:1067
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches môže byť použité iba počas odstránenia balíkov"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles môže byť použité iba počas inštalácie balíka"
 
-#: rpm.c:1042
+#: rpm.c:1079
 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"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1137,7 +1162,7 @@ msgstr ""
 "--noscripts môže byť použité iba počas inštalácie, odstránenia alebo "
 "overenia balíka"
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1145,7 +1170,7 @@ msgstr ""
 "--notriggers môže byť použité iba počas inštalácie, odstránenia alebo "
 "overenia balíka"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1154,7 +1179,7 @@ msgstr ""
 "--nodeps môže byť použité iba počas inštalácie, odstránenia alebo overenia "
 "balíka"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1162,7 +1187,7 @@ msgstr ""
 "--test môže byť použité iba počas inštalácie, odstránenia alebo zostavenia "
 "balíka"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1170,122 +1195,122 @@ 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"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pre --root (-r) musia začínať znakom /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage môže byť použíté iba počas aktualizácie"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "ftp voľby môže byť použíté iba počas otázok, inštalácie alebo aktualizácie"
 
-#: rpm.c:1093
+#: rpm.c:1131
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "http voľby môže byť použíté iba počas otázok, inštalácie alebo aktualizácie"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp môže byť použíté iba počas overenia podpisu"
 
-#: rpm.c:1100
+#: rpm.c:1139
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg môže byť použíté iba počas overenia podpisu"
 
-#: rpm.c:1103
+#: rpm.c:1142
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 môže byť použíté iba počas overenia podpisu alebo balíka"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "nie je možné pracovať so súborom %s\n"
 
-#: rpm.c:1151
+#: rpm.c:1192
 msgid "pgp not found: "
 msgstr "pgp nebolo nájdené: "
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Kontrola hesla zlyhala\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Heslo je v poriadku.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Chybná špecifikácia %%_signature v makro-súbore.\n"
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign môže byť použíté iba počas zostavenia balíka"
 
-#: rpm.c:1186
+#: rpm.c:1227
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "neočakávané argumenty pre --querytags"
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "neboli zadané žiadne balíky pre overenie podpisu"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "neboli zadané žiadne balíky na podpis"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "neboli zadané žiadne balíky pre znovuzostavenie"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "neboli zadané žiadne spec-súbory pre zostavenie"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "neboli zadané žiadne tar-súbory pre zostavenie"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "neboli zadané žiadne balíky pre odinštalovanie"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "neboli zadané žiadne balíky pre inštaláciu"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "boli zadané nadbytočné argumenty otázky pre všetky balíky"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "neboli zadané žiadne argumenty pre otázku"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "boli zadané nadbytočné argumenty otázky pre všetky balíky"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "neboli zadané žiadne argumenty pre overenie"
 
@@ -3635,6 +3660,21 @@ msgstr "chýbajúce    %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyriešené závislosti pre %s-%s-%s: "
 
+#~ msgid "        --requires"
+#~ msgstr "        --requires"
+
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "presunúť súbory napriek tomu, že to balík nedovoľuje"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "po ukončení odstrániť zdrojové súbory a spec-súbor"
+
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    --rmsource <spec>     "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "odstrániť zdroje a spec-súbor"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
diff --git a/po/sl.po b/po/sl.po
index 14d9f25f5..77cfa9bae 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.42 2000/05/18 13:00:54 jbj Exp $
+# $Id: sl.po,v 1.43 2000/05/24 17:53:37 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -89,7 +89,7 @@ msgstr "preglasujemo operacijski sistem izgradnje"
 msgid "override build root"
 msgstr "preglasujemo vrhnji imenik izgradnje"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "po zaključku odstranimo delovni imenik"
 
@@ -101,7 +101,7 @@ msgstr "ne izvajamo nobene od stopenj izgradnje"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "ne sprejemamo internacionaliziranih katalogov iz datoteke spec"
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 msgid "remove sources when done"
 msgstr "po zaključku odstranimo izvorno kodo"
 
@@ -109,7 +109,7 @@ msgstr "po zaključku odstranimo izvorno kodo"
 msgid "remove specfile when done"
 msgstr "po zaključku odstranimo datoteko spec"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "preskočimo naravnost na določeno stopnjo (samo za c,i)"
 
@@ -163,445 +163,482 @@ msgstr "paketa ni najti v podatkovni zbirki"
 msgid "no copyright!\n"
 msgstr "ni copyrighta!\n"
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM različica %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 "Dovoljeno je razmnoževanje in razširjanje pod pogoji, navedenimi v GNU GPL."
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "uporaba: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <imenik>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <imenik>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <datoteka>] [--ignorearch] [--dbpath "
 "<imenik>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <imenik>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                        [--ftpproxy <rač.>] [--ftpport <vrata>] [--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <rač.>] [--httpport <vrata>] "
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate stara_pot=nova_pot]"
 
-#: rpm.c:235
+#: rpm.c:246
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <pot>]"
 
-#: rpm.c:236
+#: rpm.c:247
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <imenik>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <datoteka>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <imenik>] [--prefix "
 "<imenik>] "
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <rač.>] [--ftpport <vrata>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:245
+#: rpm.c:256
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <pot>] [--ignoresize]"
 
-#: rpm.c:246
+#: rpm.c:257
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <rač.>]"
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <vrata>] [--provides] [--triggers] "
 "[--dump]"
 
-#: rpm.c:253
+#: rpm.c:264
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <imenik>] [targets]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <imenik>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [target]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [target]"
 
-#: rpm.c:259
+#: rpm.c:270
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <imenik>] [--noscripts] [--rcfile <datoteka>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <imenik>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] paket1 ... paketN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<datoteka>]"
 
-#: rpm.c:264
+#: rpm.c:275
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 
-#: rpm.c:265
+#: rpm.c:276
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=okolje1[,okolje2...]]"
 
-#: rpm.c:266
+#: rpm.c:277
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] datoteka_spec"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "       rpm {--rmsource} [--rcfile <datoteka>] [-v] datoteka_spec"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpm.c:272
+#: rpm.c:283
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<datoteka>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paket2"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "uporaba:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "to sporočilo"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "uporabljana različica rpm"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   vsi načini podpirajo naslednje argumente:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
-msgstr "      --rcfile <datoteka> "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
+msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "uporabite <datoteka> namesto /etc/rpmrc in $HOME/.rpmrc"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "z nekaj več komentarja med potekom"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    --pipe <ukaz>         "
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "z vsem komentarjem (za odpravo napak)"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "uporabljana različica rpm"
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "poizvedbeni način"
+#: rpm.c:332
+msgid "    --pipe <cmd>          "
+msgstr "    --pipe <ukaz>         "
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr "      --root <imenik>     "
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "standardni izhod preusmerimo na <ukaz>"
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "uporabi <imenik> za vrhnji imenik"
+#: rpm.c:334
+#, fuzzy
+msgid "    --rcfile <file>       "
+msgstr "      --rcfile <datoteka> "
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
-msgstr "      --dbpath <imenik>   "
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "uporabite <datoteka> namesto /etc/rpmrc in $HOME/.rpmrc"
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "išči podatkovno zbirko v <imeniku>"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
+msgstr ""
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
-msgstr "      --queryformat <qfmt>"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "z nekaj več komentarja med potekom"
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "uporabi <qfmt> kot obliko glave (implicira -i)"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "z vsem komentarjem (za odpravo napak)"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   namestitev, obnova in poizvedba (z -p) omogočata, da namesto imen datotek"
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr "   navedemo URL za FTP; poleg tega pa še naslednje možnosti:"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <rač.>   "
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "ime računalnika ali IP za zastopnika FTP"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <vrata>   "
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "številka vrat za FTP na strežniku ali zastopniku"
 
-#: rpm.c:335
-msgid "      --httpproxy <host>   "
+#: rpm.c:350
+#, fuzzy
+msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <rač.>   "
 
-#: rpm.c:336
+#: rpm.c:351
 msgid "hostname or IP of http proxy"
 msgstr "ime računalnika ali IP za zastopnika HTTP"
 
-#: rpm.c:337
-msgid "      --httpport <port>    "
+#: rpm.c:352
+#, fuzzy
+msgid "      --httpport <port>   "
 msgstr "      --httpport <vrata>   "
 
-#: rpm.c:338
+#: rpm.c:353
 msgid "port number of http server (or proxy)"
 msgstr "številka vrat za HTTP na strežniku ali zastopniku"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "poizvedbeni način"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr "      --dbpath <imenik>   "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "išči podatkovno zbirko v <imeniku>"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr "      --queryformat <qfmt>"
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "uporabi <qfmt> kot obliko glave (implicira -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr "      --root <imenik>     "
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "uporabi <imenik> za vrhnji imenik"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Možnosti za določitev paketov:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "poizvedba po vseh paketih"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr "        -f <datoteka>+    "
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr "        -p <paket>+       "
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "poizvedba po (že nameščenem) <paketu>"
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pkg>"
 
-#: rpm.c:347
+#: rpm.c:372
 msgid "query packages triggered by <pkg>"
 msgstr "poizvedba po paketih, ki jih sproži paket <pkg>"
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <mož>"
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr "poizvedba po paketih, ki ponujajo dano <mož>nost"
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <mož>"
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr "poizvedba po paketih, ki potrebujejo dano <mož>nost"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Izbire izbora informacij:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "izpis informacij o paketu"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "izpis dnevnika sprememb paketa"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "izpis seznama datotek v paketu"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "prikaz statusa datotek (privzema -i)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "seznam datotek z dokumetacijo (privzema -i)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "seznam nastavitvenih datotek (privzema -i)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -609,187 +646,164 @@ msgstr ""
 "prikaz vseh preverljivih informacij o vsaki datoteki (le skupaj z -l, -c ali "
 "-d)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "izpis možnosti, ki jih nudi paket"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr "        --requires"
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "izpis odvisnosti paketa"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "izpis različnih (od)namestitvenih skriptov"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr "prikaz prožilnih skriptov, ki jih paket vsebuje"
 
-#: rpm.c:379
-msgid "    --pipe <cmd>          "
-msgstr "    --pipe <ukaz>         "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "standardni izhod preusmerimo na <ukaz>"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "namestitev paketa preverimo z enakimi izbirnimi določili kot -q"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "brez preverjanja nadzorne vsote md5"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "brez preverjanja prilastkov datotek"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"dovoljenja za datoteke postavimo na vrednosti v paketu, z istimi izbirnimi "
-"določilili kot pri -q"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"lastnika in skupino datoteke postavimo na vrednosti v paketu, z istimi "
-"izbirnimi določili kot pri -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "izpiši značke, ki pridejo v poštev pri poizvedbi"
 
-#: rpm.c:402
+#: rpm.c:418
 msgid "    --install <packagefile>"
 msgstr "    --install <paket>      "
 
-#: rpm.c:403
+#: rpm.c:419
 msgid "    -i <packagefile>      "
 msgstr "    -i <paket>            "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "namestimo paket"
 
-#: rpm.c:405
+#: rpm.c:421
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <pot> "
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr "preskočimo datoteke v navedeni poti"
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <starapot>=<novapot>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "datoteke iz stare poti prestavimo v novo"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "datoteke prestavimo, četudi paket tega ne dovoli"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "poti %s ni možno premakniti za paket %s-%s-%s"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <imenik>   "
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "če je dovoljeno, paket prestavimo v <imenik>"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "brez namestitve dokumentacije"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "okrajšava za --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "namestitev vseh datotek, vključno z nastavitvenimi, ki so sicer izpuščene"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr "brez preverjanja prostora na disku pred nameščanjem"
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "brez preverjanja operacijskega sistema paketa"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "namesti dokumentacijo"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "obnovi podatkovno zbirko, a ne spreminjaj datotečnega sistema"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr "brez izvajanja katerihkoli skriptov, ki jih požene ta paket"
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "z izpisom procentov med namestitvijo"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "namesti, četudi paket piše prek že nameščenih datotek"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "ponovno namesti, če paket že obstaja"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "ne namesti, a ugotovi, če bi delovalo"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <paket>      "
 
-#: rpm.c:455
+#: rpm.c:471
 msgid "    -U <packagefile>      "
 msgstr "    -U <paket>            "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "nadgradi paket (iste izbire kot --install in še:)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -797,15 +811,15 @@ msgstr ""
 "nadgraditev na starejšo različico paketa (--force pri nadgradnjah "
 "avtomatično vključi to izbiro)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr "    --erase <paket>   "
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "zbriši (odstrani) paket"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -813,90 +827,91 @@ msgstr ""
 "odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer izidemo z izidom o "
 "napaki, če <paket> določa več paketov)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "brez izvajanja katerihkoli skriptov paketa"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<stopnja> <spec>    "
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<stopnja> <arhiv tar>"
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "zgradi paket do navedene stopnje, ki je ena od:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "priprava (razpakiraj izvorno kodo in uporabi krparije)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "preverjanje (površno preverjanje %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "prevod (priprava in prevajanje)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "namestitev (pripava, prevajanje, namestitev)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "prevedeni paket (priprava, prevajanje, namestitev, izgradnja paketa)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "prevedeni in izvorni paket (priprava, prevajanje, namestitev, izgradnja "
 "paketa)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
-msgstr "odstrani izvorno kodo in datoteke spec, ko opraviš"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
+msgstr "po zaključku odstranimo datoteko spec"
 
-#: rpm.c:502
+#: rpm.c:520
 msgid "generate PGP/GPG signature"
 msgstr "izdelava podpisa PGP/GPG"
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <imenik>"
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "<imenik> naj bo korenski imenik pri izgradnji"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr "      --target=<s.okolje>+"
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "izgradi pakete za navedena ciljna strojna okolja"
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: rpm.c:509
+#: rpm.c:527
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sek>   "
 
-#: rpm.c:510
+#: rpm.c:528
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "največji dopustni čas izgradnje paketa (0 brez omejitev)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <izv.paket> "
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -904,220 +919,230 @@ msgstr ""
 "Namesti izvorni paket, izgradi prevedeni paket in pobriši datoteko spec, "
 "izvorno kodo, krpe in ikone."
 
-#: rpm.c:514
-msgid "    --rmsource <spec>     "
-msgstr "    --rmsource <spec>     "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "odstrani izvorno kodo in datoteko spec"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <izv.pak.>"
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "kot --rebuild, a brez izgradnje kakršnegakoli paketa"
 
-#: rpm.c:518
+#: rpm.c:536
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <paket>+     "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "podpiši paket(e) (trenutni podpis zavržemo)"
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <paket>+    "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "dodaj podpis k paketu(-om)"
 
-#: rpm.c:523
-msgid "    --checksig <pkg>+     "
+#: rpm.c:540
+#, fuzzy
+msgid "    --checksig <pkg>+"
 msgstr "    --checksig <paket>+   "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    --resign <paket>+     "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "preveri podpis paketa(-ov)"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "preskoči vse podpise PGP"
 
-#: rpm.c:528
+#: rpm.c:546
 msgid "skip any GPG signatures"
 msgstr "preskoči vse podpise GPG"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "preskoči vse podpise MD5"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "izpiši značke, ki pridejo v poštev pri poizvedbi"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "preveri, če obstaja veljavna zbirka"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "ponovno izgradi zbirko iz obstoječe"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"dovoljenja za datoteke postavimo na vrednosti v paketu, z istimi izbirnimi "
+"določilili kot pri -q"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"lastnika in skupino datoteke postavimo na vrednosti v paketu, z istimi "
+"izbirnimi določili kot pri -q"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "samo en glavni način sme biti izbran"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u in --uninstall nista več podprti izbiri in ne delujeta več.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Namesto njiju uporabite -e ali --erase.\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) zahteva enega od a,b,i,c,p,l kot svoj edini argument"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--tarbuild (-t) zahteva enega od a,b,i,c,p,l kot svoj edini argument"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo en tip poizvedbe/preverjanja naenkrat je možen"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "argumenti --dbpath se morajo zaključiti z /"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "prestavitve se morajo začeti z /"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "prestavitve morajo vsebovati ="
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "prestavitve morajo imeti /, ki sledi ="
 
-#: rpm.c:897
+#: rpm.c:932
 msgid "exclude paths must begin with a /"
 msgstr "poti, ki jih preskočimo, se morajo začeti z /"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Interna napake pri obdelavi argumentov (%d)\n"
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "podani --dbpath ne uporablja podatkovne zbirke"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck smemo podati samo pri izgradnji paketa"
 
-#: rpm.c:964
+#: rpm.c:1001
 msgid "unexpected query flags"
 msgstr "nepričakovane zastavice pri poizvedbi"
 
-#: rpm.c:967
+#: rpm.c:1004
 msgid "unexpected query format"
 msgstr "nepričakovana oblika poizvedbe"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "nepričakovan izvor poizvedbe"
 
-#: rpm.c:976
+#: rpm.c:1013
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "datoteke lahko prestavimo samo pri namestitvi paketa"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "izbiri --prefix in --relocate se izključujeta"
 
-#: rpm.c:985
+#: rpm.c:1022
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "izbiri --relocate in --excludepath lahko uporabimo samo pri namestitvi"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix smemo uporabiti samo pri namestitvi"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti izbire --prefix se morajo začeti z /"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "izbiri --excludedocs in --includedocs se izključujeta"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1030
+#: rpm.c:1067
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches smemo podati samo ob odstranitvi paketa"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles smemo podati samo ob namestitvi paketa"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb smemo podati samo ob namestitvi ali odstranitvi paketa"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1125,7 +1150,7 @@ msgstr ""
 "--noscripts smemo podati samo ob namestitvi, odstranitvi ali preverjanju "
 "paketa"
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1133,7 +1158,7 @@ msgstr ""
 "--notriggers smemo podati samo ob namestitvi, odstranitvi ali preverjanju "
 "paketa"
 
-#: rpm.c:1055
+#: rpm.c:1092
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -1141,14 +1166,14 @@ msgstr ""
 "--nodeps smemo podati samo ob izgradnji, vnovični izgradnji, prevajanju, "
 "namestitvi, odstranitvi ali preverjanju paketa"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test smemo podati samo ob namestitvi, odstranitvi ali izgradnji paketa"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1156,120 +1181,120 @@ msgstr ""
 "--root (-r) smemo podati samo ob namestitvi, odstranitvi poizvedbi ali "
 "vnovični izgradnji paketa"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti izbire --root (-r) se morajo začeti z /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage smemo podati samo ob nadgradnji"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr "izbire za ftp smemo podati samo ob poizvedbi, namestitvi in nadgradnji"
 
-#: rpm.c:1093
+#: rpm.c:1131
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "izbire za http smemo podati samo ob poizvedbi, namestitvi in nadgradnji"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp smemo podati samo ob preverjanju podpisa"
 
-#: rpm.c:1100
+#: rpm.c:1139
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg smemo podati samo ob preverjanju podpisa"
 
-#: rpm.c:1103
+#: rpm.c:1142
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 smemo podati samo ob preverjanju podpisa ali paketa"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr "datoteka za podpis manjka\n"
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "dostop do datoteke %s ni možen\n"
 
-#: rpm.c:1151
+#: rpm.c:1192
 msgid "pgp not found: "
 msgstr "pgp manjka: "
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr "Vnesite pristopno geslo: "
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Preverjanje pristopnega gesla neuspešno\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Pristopno geslo je pravo.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Neveljaven %%_signature v makrodatoteki.\n"
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign smemo podati samo ob izgradnji paketa"
 
-#: rpm.c:1186
+#: rpm.c:1227
 msgid "exec failed\n"
 msgstr "exec neuspešen\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "nepričakovani argumenti za --querytags "
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "paketi za preverjanje podpisa niso navedeni"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "paketi za podpisovanje niso navedeni"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovično izgradnjo niso navedeni"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "paketi za odstranitev niso navedeni"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "paketi za namestitev niso navedeni"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "pri poizvedbi paketov so podani odvečni argumenti"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpm.c:1415
+#: rpm.c:1456
 msgid "extra arguments given for verify of all packages"
 msgstr "pri preverjanju paketov so podani odvečni argumenti"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
@@ -3614,6 +3639,21 @@ msgstr "manjka     %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
 
+#~ msgid "        --requires"
+#~ msgstr "        --requires"
+
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "datoteke prestavimo, četudi paket tega ne dovoli"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "odstrani izvorno kodo in datoteke spec, ko opraviš"
+
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    --rmsource <spec>     "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "odstrani izvorno kodo in datoteko spec"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
diff --git a/po/sr.po b/po/sr.po
index cda787f01..358357ba6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -97,7 +97,7 @@ msgstr "nemoj proveravati operativni sistem za paket"
 msgid "override build root"
 msgstr "koristi <dir> kao korenski katalog kod kreiranja"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "ukloni stablo direktorijuma po završetku"
 
@@ -110,7 +110,7 @@ msgstr "nemoj izvršiti nijednu fazu"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po završetku"
@@ -120,7 +120,7 @@ msgstr "ukloni izvorne datoteke i datoteku specifikacije po završetku"
 msgid "remove specfile when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po završetku"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "idi pravo do određene faze (samo za k,i)"
 
@@ -176,441 +176,476 @@ msgstr "paket %s nije nađen u %s"
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzija %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Možete slobodno distribuirati dalje pod odredbama GNU GPL"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "korišćenje: {rpm --help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:235
+#: rpm.c:246
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:236
+#: rpm.c:247
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:256
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:246
+#: rpm.c:257
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:264
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:262
+#: rpm.c:273
 #, fuzzy
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: rpm.c:264
+#: rpm.c:275
 #, fuzzy
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:265
+#: rpm.c:276
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "\trpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpm.c:272
+#: rpm.c:283
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "korišćenje:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "štampaj ovu poruku"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "napiši verziju rpm-a koja se koristi"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   svi režimi podržavaju sledeće argumente:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "koristi <datoteku> umesto /etc/rpmrc i $HOME/.rpmrc"
-
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "budi malko pričljiviji"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "budi neverovatno pričljiv (zbog nalaženja grešaka)"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "režim upita"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "napiši verziju rpm-a koja se koristi"
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr ""
+#: rpm.c:332
+#, fuzzy
+msgid "    --pipe <cmd>          "
+msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "koristi <dir> kao direktorijum najvišeg nivoa"
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "pošalji standardni izlaz u <komandu>"
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
+#: rpm.c:334
 #, fuzzy
-msgid "      --dbpath <dir>      "
+msgid "    --rcfile <file>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "koristi <dir> kao direktorijum baze podataka"
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "koristi <datoteku> umesto /etc/rpmrc i $HOME/.rpmrc"
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:328
-#, fuzzy
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "koristi s kao format zaglavlja (povlači -i)"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "budi malko pričljiviji"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "budi neverovatno pričljiv (zbog nalaženja grešaka)"
+
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   instaliranje, poboljšavanja i upit (sa -p) dozvoljavaju korišćenje URL-ova"
 
-#: rpm.c:330
+#: rpm.c:345
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr "   na mestu imena datoteka kao i sledeće opcije:\n"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "ime hosta ili IP ftp proxy-ja"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "broj porta FTP servera (ili proxy)"
 
-#: rpm.c:335
+#: rpm.c:350
 #, fuzzy
-msgid "      --httpproxy <host>   "
+msgid "      --httpproxy <host>  "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:336
+#: rpm.c:351
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "ime hosta ili IP ftp proxy-ja"
 
-#: rpm.c:337
+#: rpm.c:352
 #, fuzzy
-msgid "      --httpport <port>    "
+msgid "      --httpport <port>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:338
+#: rpm.c:353
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "broj porta FTP servera (ili proxy)"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "režim upita"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+#, fuzzy
+msgid "      --dbpath <dir>      "
+msgstr "    -b<faza> <spec>\t "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "koristi <dir> kao direktorijum baze podataka"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr ""
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "koristi s kao format zaglavlja (povlači -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr ""
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "koristi <dir> kao direktorijum najvišeg nivoa"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Opcije odrednice paketa:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "upit nad svim paketima"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "upit za (deinstaliran) paket <paketdatoteka>"
 
-#: rpm.c:346
+#: rpm.c:371
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:347
+#: rpm.c:372
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:348
+#: rpm.c:373
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:349
+#: rpm.c:374
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "upit za pakete koji omogućavaju <i> svojstvo"
 
-#: rpm.c:350
+#: rpm.c:375
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:351
+#: rpm.c:376
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Opcije za selekciju informacije:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "prikaži informacije o paketu"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "prikaži dnevnik promene paketa"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "prikaži listu datoteka u paketu"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "prikaži stanja datoteka (povlači -i)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "prikaži samo datoteke iz dokumentacije (povlači -i)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "prikaži samo konfiguracione datoteke (povlači -i)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -618,36 +653,23 @@ msgstr ""
 "pokaži sve informacije koje se mogu proveriti za svaku datoteku (mora se "
 "koristiti sa -l, -c ili -d)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "pokaži koja svojstva donosi paket"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr ""
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "pokaži zavisnosti paketa"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "ispiši razne skriptove za [de]instalaciju"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:379
-#, fuzzy
-msgid "    --pipe <cmd>          "
-msgstr "    -b<faza> <spec>\t "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "pošalji standardni izlaz u <komandu>"
-
-#: rpm.c:382
+#: rpm.c:403
 #, fuzzy
 msgid ""
 "verify a package installation using the same same package specification "
@@ -655,173 +677,162 @@ msgid ""
 msgstr ""
 "proveri instalaciju paketa koristeći iste opcije za određenje paketa kao i -q"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "nemoj proveravati md5 kontrolne sume datoteke"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "nemoj proveravati atribute datoteke"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"postavi dozvole datoteke kao one u bazi podataka paketa koristeći iste "
-"opcije za određenje datoteka kao i -q"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"postavi vlasnika i grupu datoteke kao i one u bazi podataka paketa koristeći "
-"iste opcije za određenje datoteka kao i -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "ispiši tag-ove koji mogu biti korišćeni u formatu upita"
 
-#: rpm.c:402
+#: rpm.c:418
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "instaliraj paket"
 
-#: rpm.c:403
+#: rpm.c:419
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "instaliraj paket"
 
-#: rpm.c:405
+#: rpm.c:421
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:407
+#: rpm.c:423
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "premesti datoteke čak iako paket to ne dozvoljava"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "paket %s nije instaliran\n"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "premesti paket u <dir>, ako se može premestiti"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "nemoj da instaliraš dokumentaciju"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skraćenica za --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "piši heš-znak (#) kako odmiče instaliranje paketa (dobro dođe sa -v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaliraj sve datoteke, čak i konfiguracije koje bi inače bile preskočene"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "nemoj proveravati operativni sistem za paket"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "instaliraj dokumentaciju"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "ažuriraj bazu podataka, ali nemoj menjati fajl-sistem"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "nemoj izvršiti nijedan instalacioni skript"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "piši procente instalacije paketa"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "instaliraj čak iako će paket zameniti instalirane datoteke"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "ponovo instaliraj ako je paket već prisutan"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "nemoj instalirati, ali reci da li će da radi ili ne"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:471
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "ažuriraj paket (iste opcije kao --install, plus)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 "ažuriraj na staru verziju paketa (--force kod ažuriranja ovo radi automatski)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "izbriši (deinstaliraj) paket"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -829,93 +840,94 @@ msgstr ""
 "ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se greška ako "
 "<paket> označava više paketa)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "nemoj izvršiti nijedan skript iz paketa"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:481
+#: rpm.c:497
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "napravi paket, gde je <faza> jedna od:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "provera liste (mala provera na %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "kompilacija (priprema i kompilacija)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "instalacija (priprema, kompilacija, instalacija)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po završetku"
 
-#: rpm.c:502
+#: rpm.c:520
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "napravi PGP potpis"
 
-#: rpm.c:503
+#: rpm.c:521
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "koristi <dir> kao korenski katalog kod kreiranja"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: rpm.c:509
+#: rpm.c:527
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:510
+#: rpm.c:528
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "postavi vremensku proveru na S sekundi (0 je deaktivira)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -923,231 +935,239 @@ msgstr ""
 "instaliraj izvorni paket, napravi binarni paket i ukloni specifikaciju, "
 "izvorne datoteke, zakrpe i ikone."
 
-#: rpm.c:514
-#, fuzzy
-msgid "    --rmsource <spec>     "
-msgstr "    -b<faza> <spec>\t "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "ukloni izvorne datoteke i datoteku specifikacije"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "kao i --rebuild, samo nemoj praviti nikakav paket"
 
-#: rpm.c:518
+#: rpm.c:536
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "potpiši paket (ukloni tekući potpis)"
 
-#: rpm.c:520
+#: rpm.c:538
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "dodaj potpis u paket"
 
-#: rpm.c:523
+#: rpm.c:540
 #, fuzzy
-msgid "    --checksig <pkg>+     "
+msgid "    --checksig <pkg>+"
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    -b<faza> <spec>\t "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "proveri potpis u paketu"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "preskoči sve PGP potpise"
 
-#: rpm.c:528
+#: rpm.c:546
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "preskoči sve PGP potpise"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "preskoči sve MD5 potpise"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "ispiši tag-ove koji mogu biti korišćeni u formatu upita"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "uveri se da postoji ispravna baza podataka"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"postavi dozvole datoteke kao one u bazi podataka paketa koristeći iste "
+"opcije za određenje datoteka kao i -q"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"postavi vlasnika i grupu datoteke kao i one u bazi podataka paketa koristeći "
+"iste opcije za određenje datoteka kao i -q"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "samo jedan glavni režim može biti naveden"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u i --uninstall nisu više podržani i ne rade više.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Koristite -e ili --erase.\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) zahteva jedan od sledećih podargumenata: a,b,i,c,p ili l"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "--tarbuild (-t) zahteva jedan od sledećih podargumenata: a,b,c,i,p ili l"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo jedan tip upita/provere može biti urađen odjednom"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "argumenti za --dbpath moraju početi znakom '/'"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "premeštanja moraju imati znak ="
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "premeštanja moraju imati / praćeno sa ="
 
-#: rpm.c:897
+#: rpm.c:932
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck se može koristiti samo kod kreiranja paketa"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neočekivan izvor upita"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neočekivan izvor upita"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "neočekivan izvor upita"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "samo instalacija i ažuriranje mogu biti forsirane"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "datoteke mogu biti premeštene samo tokom instalacije paketa"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "samo jedno možete koristiti: --prefix ili --relocate"
 
-#: rpm.c:985
+#: rpm.c:1022
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate možete koristiti samo kad instalirate novi paket"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix možete koristiti samo kod instalacije novog paketa"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti za --prefix moraju početi znakom /"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "samo jedno možete da navedete: --excludedocs ili --includedocs"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1030
+#: rpm.c:1067
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches možete koristiti samo kod brisanja paketa"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles možete koristiti samo kod instalacije paketa"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1155,7 +1175,7 @@ msgstr ""
 "--noscripsts možete koristiti samo kod instalacije, uklanjanja ili provere "
 "paketa"
 
-#: rpm.c:1051
+#: rpm.c:1088
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1163,7 +1183,7 @@ msgid ""
 msgstr ""
 "--nodeps možete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1171,14 +1191,14 @@ msgid ""
 msgstr ""
 "--nodeps možete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test možete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1186,22 +1206,22 @@ msgstr ""
 "--root (-r) možete navesti samo kod instalacije, uklanjanja, upita ili "
 "rekreiranja baze podataka"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti za --root (-r) moraju početi znakom /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage se može koristiti samo tokom ažuriranja paketa"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "opcije za FTP se mogu koristiti samo kod upita, instalacije ili ažuriranja "
 "paketa"
 
-#: rpm.c:1093
+#: rpm.c:1131
 #, fuzzy
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
@@ -1209,106 +1229,106 @@ msgstr ""
 "opcije za FTP se mogu koristiti samo kod upita, instalacije ili ažuriranja "
 "paketa"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp se može koristiti samo prilikom provere potpisa"
 
-#: rpm.c:1100
+#: rpm.c:1139
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp se može koristiti samo prilikom provere potpisa"
 
-#: rpm.c:1103
+#: rpm.c:1142
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nopgp se može koristiti samo kod provere potpisa ili paketa"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpm.c:1151
+#: rpm.c:1192
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datoteka nije pronađena na serveru"
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Neuspela provera lozinke\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Lozinka je dobra.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign se može koristiti samo kod kreiranja paketa"
 
-#: rpm.c:1186
+#: rpm.c:1227
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "neočekivani argumenti za --querytags"
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "nedostaje paket za proveru potpisa"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "nedostaje paket za potpisivanje"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "neodstaje paket za deinstalaciju"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "suvišni argumenti su navedeni za upit nad svim paketima"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "suvišni argumenti su navedeni za upit nad svim paketima"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
@@ -3697,6 +3717,19 @@ msgstr "nedostaje { posle %"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene međuzavisnosti za %s-%s-%s: "
 
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "premesti datoteke čak iako paket to ne dozvoljava"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "ukloni izvorne datoteke i datoteku specifikacije po završetku"
+
+#, fuzzy
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "ukloni izvorne datoteke i datoteku specifikacije"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "datoteka %s ne pripada nijednom paketu\n"
diff --git a/po/sv.po b/po/sv.po
index 6d00ad538..c2d22296f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish messages for RPM
 # Copyright Š 1999 Free Software Foundation, Inc.
 # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.102 $
+# $Revision: 1.103 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 2000-02-21 12:20+0100\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -89,7 +89,7 @@ msgstr "ĺsidosätt tillverkningsoperativsystem"
 msgid "override build root"
 msgstr "ĺsidosätt tillverkningsrot"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "tag bort tillverkningsträd efterĺt"
 
@@ -101,7 +101,7 @@ msgstr "utför inga steg i tillverkningen"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "acceptera inte översatta \"msgstr\" frĺn spec-filen"
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 msgid "remove sources when done"
 msgstr "tag bort källkod efterĺt"
 
@@ -109,7 +109,7 @@ msgstr "tag bort källkod efterĺt"
 msgid "remove specfile when done"
 msgstr "tag bort spec-fil efterĺt"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "gĺ direkt till angivet steg (endast för c,i)"
 
@@ -163,433 +163,470 @@ msgstr "paketet inte funnet i databas"
 msgid "no copyright!\n"
 msgstr "ingen copyright!\n"
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Den här programvaran kan distribueras fritt med hänsyn till GNU GPL"
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "använd: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <kat>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <kat>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <kat>] [--ignoreos] [--nodeps] [--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                        [--ftpproxy <värd>] [--ftpport <port>] [--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <värd>] [--httpport <port>] "
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate gammalväg=nyväg]"
 
-#: rpm.c:235
+#: rpm.c:246
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <sökväg>]"
 
-#: rpm.c:236
+#: rpm.c:247
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] fil1.rpm ... filN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <kat>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <kat>] [--prefix <kat>] "
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <värd>] [--ftpport <port>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:245
+#: rpm.c:256
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <sökväg>] [--ignoresize]"
 
-#: rpm.c:246
+#: rpm.c:257
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        fil1.rpm ... filN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:250
+#: rpm.c:261
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <värd>]"
 
-#: rpm.c:252
+#: rpm.c:263
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:253
+#: rpm.c:264
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <kat>] [mĺl]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <kat>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [mĺl]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [mĺl]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [mĺl]"
 
-#: rpm.c:259
+#: rpm.c:270
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} fil1.rpm ... filN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr "       rpm {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <kat>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] paket1 ... paketN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <fil>]"
 
-#: rpm.c:264
+#: rpm.c:275
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 
-#: rpm.c:265
+#: rpm.c:276
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=plattform1[,plattform2...]]"
 
-#: rpm.c:266
+#: rpm.c:277
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] spec-fil"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "       rpm {--rmsource} [--rcfile <fil>] [-v] spec-fil"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr "       rpm {--rebuild} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <fil>] paket1 paket2 ... paketN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <fil>] paket1 paket2 ... paketN"
 
-#: rpm.c:272
+#: rpm.c:283
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paketN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "användning:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "visa detta meddelande"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "visa vilken version av rpm som används"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "alla arbetssätt stödjer följande argument:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
-msgstr "      --rcfile <fil>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
+msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "använd <fil> istället för /etc/rpmrc och $HOME/.rpmrc"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "var lite mer mĺngordig"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    --pipe <kommando>     "
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "var mycket mĺngordig (för felsökning)"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "visa vilken version av rpm som används"
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "frĺgeläge"
+#: rpm.c:332
+msgid "    --pipe <cmd>          "
+msgstr "    --pipe <kommando>     "
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr "      --root <kat>        "
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "skicka stdut till <kommando>"
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "använd <kat> som toppkatalog"
+#: rpm.c:334
+#, fuzzy
+msgid "    --rcfile <file>       "
+msgstr "      --rcfile <fil>     "
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
-msgid "      --dbpath <dir>      "
-msgstr "      --dbpath <kat>      "
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "använd <fil> istället för /etc/rpmrc och $HOME/.rpmrc"
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "använd <kat> som katalog för databasen"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
+msgstr ""
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
-msgstr "      --queryformat <ffmt>"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "var lite mer mĺngordig"
 
-#: rpm.c:328
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "använd <ffmt> som huvudformat (medför -i)"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "var mycket mĺngordig (för felsökning)"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   installera, uppgradera och frĺga (med -p) tillĺter ftp-URL:ar att användas"
 
-#: rpm.c:330
+#: rpm.c:345
 msgid "   of file names as well as the following options:"
 msgstr "   istället för filnamn, liksom följande flaggor:"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <värd>   "
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "ftp-ombudets (proxy) värdnamn eller IP"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "ftpservers (eller ombuds (proxy)) portnummer"
 
-#: rpm.c:335
-msgid "      --httpproxy <host>   "
+#: rpm.c:350
+#, fuzzy
+msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <värd>   "
 
-#: rpm.c:336
+#: rpm.c:351
 msgid "hostname or IP of http proxy"
 msgstr "http-ombudets värdnamn eller IP"
 
-#: rpm.c:337
-msgid "      --httpport <port>    "
+#: rpm.c:352
+#, fuzzy
+msgid "      --httpport <port>   "
 msgstr "      --httpport <port>    "
 
-#: rpm.c:338
+#: rpm.c:353
 msgid "port number of http server (or proxy)"
 msgstr "httpservers (eller ombuds) portnummer"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "frĺgeläge"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+msgid "      --dbpath <dir>      "
+msgstr "      --dbpath <kat>      "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "använd <kat> som katalog för databasen"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr "      --queryformat <ffmt>"
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "använd <ffmt> som huvudformat (medför -i)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr "      --root <kat>        "
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "använd <kat> som toppkatalog"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Flaggor för paketval:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "frĺga om alla paket"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr "        -f <fil>+         "
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "frĺga om paket som äger <fil>"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr "        -p <paketfil>+ "
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "frĺga om (oinstallerat) paket <paketfil>"
 
-#: rpm.c:346
+#: rpm.c:371
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pkt>"
 
-#: rpm.c:347
+#: rpm.c:372
 msgid "query packages triggered by <pkg>"
 msgstr "frĺga om paket utlösta av <pkt>"
 
-#: rpm.c:348
+#: rpm.c:373
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <egenskap>"
 
-#: rpm.c:349
+#: rpm.c:374
 msgid "query packages which provide <cap> capability"
 msgstr "undersök paket som tillhandahĺller <egenskap>"
 
-#: rpm.c:350
+#: rpm.c:375
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <egenskap>"
 
-#: rpm.c:351
+#: rpm.c:376
 msgid "query packages which require <cap> capability"
 msgstr "undersök paket som behöver <egenskap>"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Flaggor för informationsval:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "visa paketinformation"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "visa paketets ändringslogg"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "visa paketets fillista"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "visa filers status (implicerar -l)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "visa enbart dokumentationsfiler (implicerar -l)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr "visa enbart konfigurationsfiler (implicerar -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -597,188 +634,165 @@ msgstr ""
 "visa all verifierbar information för varje fil (mĺste användas med -l, -c "
 "eller -d)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "visa de egenskaper paketet tillhandahĺller"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr "        --requires"
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "lista paketberoenden"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "visa de olika [av]installationsskripten"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr "visa utlösningsskripten i paketet"
 
-#: rpm.c:379
-msgid "    --pipe <cmd>          "
-msgstr "    --pipe <kommando>     "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "skicka stdut till <kommando>"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "verifiera ett pakets installation med samma urvalsflaggor som till -q"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "verifiera inte md5-kontrollsummor"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "verifiera inte filattribut"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"sätt filrättigheterna till de i paketdatabasen med samma "
-"paketspecifikationsflaggor som -q"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"sätt filägare och -grupp till de i paketdatabasen med samma "
-"paketspcifikationsflaggor som -q"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "visa taggar som kan användas i frĺgeformat"
 
-#: rpm.c:402
+#: rpm.c:418
 msgid "    --install <packagefile>"
 msgstr "    --install <paketfil>"
 
-#: rpm.c:403
+#: rpm.c:419
 msgid "    -i <packagefile>      "
 msgstr "    -i <paketfil>         "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "installera paket"
 
-#: rpm.c:405
+#: rpm.c:421
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <sökväg>"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr "hoppa över filer i <sökv>"
 
-#: rpm.c:407
+#: rpm.c:423
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <frĺnskv>=<tillskv>"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "flytta filer frĺn <frĺnskv> till <tillskv>"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "flytta filer trots att paketet inte tillĺter det"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "sökväg %s är inte relokerbar för paket %s-%s-%s"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <katalog>  "
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "flytta paketet till <katalog>, om flyttbart"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "installera inte dokumentation"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "kortform för --replacepkgs --replacefiles"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "skriv ut brädgĺrdar allt eftersom paketet installeras (bra tillsammans med "
 "-v)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "installera alla filer, även konfigurationer som annars kunde hoppats över"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "verifiera inte paketarkitektur"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr "kontrollera inte skivutrymme före installation"
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "verifiera inte paketets operativsystem"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "installera dokumentation"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "uppdatera databasen, men ändra inte filsystemet"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "kör inte installationsskript"
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr "kör inte utlösningsskript utlösta av detta paket"
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "skriv procent allt eftersom paketet installeras"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "installera även om paketet byter ut installerade filer"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "installera om ifall paketet redan är installerat"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <paketfil>"
 
-#: rpm.c:455
+#: rpm.c:471
 msgid "    -U <packagefile>      "
 msgstr "    -U <paketfil>         "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "uppgradera paket (samma flaggor som --install, samt)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -786,15 +800,15 @@ msgstr ""
 "uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
 "detta automatiskt)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr "    --erase <paket>"
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "ta bort (avinstallera) paket"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -802,88 +816,89 @@ msgstr ""
 "ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
 "specificerar flera paket)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "kör inte paketspecifika skript"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<steg> <spec>       "
 
-#: rpm.c:481
+#: rpm.c:497
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<steg> <tarboll>    "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "tillverka paket, där <steg> är nĺgot av:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "förbered (packa upp källkod samt applicera patchar)"
 
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrollera (gör nĺgra enkla kontroller pĺ %files)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "kompilera (förbered och kompilera)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "installera (förbered, kompilera, installera)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr "binärpaketera (förbered, kompilera, installera, paketera)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "binär- och källpaketera (förbered, kompilera, installera, paketera)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
-msgstr "ta bort källkod och spec-fil efterĺt"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
+msgstr "tag bort spec-fil efterĺt"
 
-#: rpm.c:502
+#: rpm.c:520
 msgid "generate PGP/GPG signature"
 msgstr "tillverka en PGP/GPG-signatur"
 
-#: rpm.c:503
+#: rpm.c:521
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <kat>   "
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "använd <kat> som tillverkningsrot"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr "      --target=<plattfrm>+"
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "tillverka paketen för mĺlen plattfrm1...plattfrmN."
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "utför inga steg"
 
-#: rpm.c:509
+#: rpm.c:527
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sek>   "
 
-#: rpm.c:510
+#: rpm.c:528
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "sätt tidskontrollen till <sek> sekunder (0 slĺr av)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <källpaket> "
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -891,222 +906,232 @@ msgstr ""
 "installera källpaket, tillverka binärpaket och och ta bort spec-fil, "
 "källkod, patchar och ikoner."
 
-#: rpm.c:514
-msgid "    --rmsource <spec>     "
-msgstr "    --rmsource <spec>     "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "ta bort källkod och spec-fil"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <källpkt> "
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "som --rebuild, men tillverka inga paket"
 
-#: rpm.c:518
+#: rpm.c:536
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pkt>+       "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "signera ett paket (släng nuvarande signatur)"
 
-#: rpm.c:520
+#: rpm.c:538
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pkt>+      "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "lägg till signatur till ett paket"
 
-#: rpm.c:523
-msgid "    --checksig <pkg>+     "
+#: rpm.c:540
+#, fuzzy
+msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pkt>+     "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    --resign <pkt>+       "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "verifiera paketsignatur"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "hoppa över eventuella PGP-signaturer"
 
-#: rpm.c:528
+#: rpm.c:546
 msgid "skip any GPG signatures"
 msgstr "hoppa över eventuella GPG-signaturer"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "hoppa över eventuella MD5-signaturer"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "visa taggar som kan användas i frĺgeformat"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "förvissa dig om att en giltig databas existerar"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "bygg om databasen frĺn existerande databas"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"sätt filrättigheterna till de i paketdatabasen med samma "
+"paketspecifikationsflaggor som -q"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"sätt filägare och -grupp till de i paketdatabasen med samma "
+"paketspcifikationsflaggor som -q"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "enbart ett läge kan specifieras"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u och --uninstall undanbedes och fungerar inte längre.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Använd -e eller --erase istället.\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--build (-b) kräver en av a,b,i,c,p,l som dess enda argument"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr "--tarbuild (-t) kräver en av a,b,i,c,p,l som sitt enda argument"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "en typ av undersökning/verifiering kan utföras ĺt gĺngen"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "argument till --dbpath mĺste börja med /"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "omflyttningar mĺste börja med /"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "omflyttningar mĺste innehĺlla ett ="
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "omflyttningar mĺste ha ett / efter ="
 
-#: rpm.c:897
+#: rpm.c:932
 msgid "exclude paths must begin with a /"
 msgstr "uteslutna sökvägar mĺste börja med /"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Internt fel i argumenthantering (%d) :-(\n"
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath angivet för en operation som inte använder nĺgon databas"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck kan enbart användas vid pakettillverkning"
 
-#: rpm.c:964
+#: rpm.c:1001
 msgid "unexpected query flags"
 msgstr "oväntade undersökningsflaggor"
 
-#: rpm.c:967
+#: rpm.c:1004
 msgid "unexpected query format"
 msgstr "oväntat undersökningsformat"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "oväntad undersökningskälla"
 
-#: rpm.c:976
+#: rpm.c:1013
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "filer kan relokeras endast under paketinstallation"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "enbart en av --prefix eller --relocate kan användas"
 
-#: rpm.c:985
+#: rpm.c:1022
 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"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan endast användas när nya paket installeras"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "argument till --prefix mĺste börja med /"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan enbart användas vid paketinstallation"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan enbart användas vid paketinstallation"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan enbart användas vid paketinstallation"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan enbart användas vid paketinstallation"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan enbart användas vid paketinstallation"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan enbart användas vid paketinstallation"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "enbart en av --excludedocs och --includedocs läge kan specifieras"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan enbart användas vid paketinstallation"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan enbart användas vid paketinstallation"
 
-#: rpm.c:1030
+#: rpm.c:1067
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan enbart användas vid paketinstallation"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan enbart användas när paket tas bort"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan enbart användas vid paketinstallation"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kan enbart användas vid installation och avinstallation av paket"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1114,7 +1139,7 @@ msgstr ""
 "--noscripts kan enbart användas vid paketinstallation, avinstallation och "
 "verifiering"
 
-#: rpm.c:1051
+#: rpm.c:1088
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1122,7 +1147,7 @@ msgstr ""
 "--notriggers kan enbart användas vid installation, avinstallation och "
 "verifiering"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1131,14 +1156,14 @@ msgstr ""
 "--nodeps kan enbart användas vid tillverkning, installation, avinstallation, "
 "och verifiering"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test kan enbart användas vid installation, avinstallation och tillverkning"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1146,121 +1171,121 @@ msgstr ""
 "--root (-r) kan enbart användas vid installation, avinstallation, förfrĺgan, "
 "och databasombyggnad"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argument till --root (-r) mĺste börja med /"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage kan enbart användas vid paketuppgraderingar"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "ftp-flaggor kan enbart användas vid förfrĺgan, installation och uppgradering"
 
-#: rpm.c:1093
+#: rpm.c:1131
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 "http-flaggor kan enbart användas vid förfrĺgan, installation och uppgradering"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp kan enbart användas vid signaturkontroll"
 
-#: rpm.c:1100
+#: rpm.c:1139
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg kan enbart användas vid signaturkontroll"
 
-#: rpm.c:1103
+#: rpm.c:1142
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 kan enbart användas vid signaturkontroll och paketverifiering"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr "inga filer att signera\n"
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan inte komma ĺt filen %s\n"
 
-#: rpm.c:1151
+#: rpm.c:1192
 msgid "pgp not found: "
 msgstr "pgp hittades inte: "
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr "Ange lösenfras: "
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Kontrollen av lösenfrasen misslyckades\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Lösenfrasen är ok.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Felaktig %%_signature spec i makrofil.\n"
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign kan enbart användas vid pakettillverkning"
 
-#: rpm.c:1186
+#: rpm.c:1227
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "oväntade argument till --querytags "
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "inga paket angivna för signatur kontroll"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "inga paket angivna för signering"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna för omtillverkning"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "ingen spec-filer angivna för tillverkning"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna för tillverkning"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "inga paket angivna för avinstallation"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "inga paket angivna för installation"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "extra argument angivna för förfrĺgan om alla paket"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna för undersökning"
 
-#: rpm.c:1415
+#: rpm.c:1456
 msgid "extra arguments given for verify of all packages"
 msgstr "extra argument angivna för verifiering av alla paket"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna för verifiering"
 
@@ -3607,6 +3632,21 @@ msgstr "saknas     %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Ouppfyllda beroenden för %s-%s-%s: "
 
+#~ msgid "        --requires"
+#~ msgstr "        --requires"
+
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "flytta filer trots att paketet inte tillĺter det"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "ta bort källkod och spec-fil efterĺt"
+
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    --rmsource <spec>     "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "ta bort källkod och spec-fil"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "%s: %s uppfyllt av tillagt paket.\n"
diff --git a/po/tr.po b/po/tr.po
index 19f3c4175..10615f3fe 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-17 12:19-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,7 +94,7 @@ msgstr "paketin ait olduđu iţletim sistemini dođrulamaz"
 msgid "override build root"
 msgstr "paket yaratýlýrken <dizin> baţlangýç dizini olarak kullanýlýr"
 
-#: build.c:388 rpm.c:498
+#: build.c:388 rpm.c:514
 msgid "remove build tree when done"
 msgstr "iţlem sonunda paket yaratma yapýsýný siler"
 
@@ -107,7 +107,7 @@ msgstr "adýmlarýn hiçbirini çalýţtýrmaz"
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394
+#: build.c:394 rpm.c:516
 #, fuzzy
 msgid "remove sources when done"
 msgstr "iţlem sonunda kaynaklarý ve spec dosyasýný siler"
@@ -117,7 +117,7 @@ msgstr "iţlem sonunda kaynaklarý ve spec dosyasýný siler"
 msgid "remove specfile when done"
 msgstr "iţlem sonunda kaynaklarý ve spec dosyasýný siler"
 
-#: build.c:398 rpm.c:496
+#: build.c:398 rpm.c:512
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "dođrudan belirtilen adýma atlar (sadece c ve i için)"
 
@@ -173,7 +173,7 @@ msgstr "%s pakedi %s içerisinde bulunamadý"
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:200
+#: rpm.c:211
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
@@ -191,142 +191,143 @@ msgstr ""
 # May 5, 1998 
 #
 # , c-format
-#: rpm.c:211
+#: rpm.c:222
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Sürüm %s\n"
 
-#: rpm.c:215
+#: rpm.c:226
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:216
+#: rpm.c:227
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Bu đrogram GNU GPL uyarýnca serbestçe dađýtýlabilir."
 
-#: rpm.c:224
-msgid "usage: rpm {--help}"
+#: rpm.c:235
+#, fuzzy
+msgid "Usage: rpm {--help}"
 msgstr "Kullaným: rpm {--help}"
 
-#: rpm.c:225
+#: rpm.c:236
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:226
+#: rpm.c:237
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <dizin>]"
 
-#: rpm.c:227
+#: rpm.c:238
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:228
+#: rpm.c:239
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <dizin>]"
 
-#: rpm.c:229
+#: rpm.c:240
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:230
+#: rpm.c:241
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <dosya>] [--ignorearch] [--dbpath <dizin>]"
 
-#: rpm.c:231
+#: rpm.c:242
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <dizin>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:232
+#: rpm.c:243
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 "                        [--ftpproxy <sunucu>] [--ftpport <port>] [--justdb]"
 
-#: rpm.c:233 rpm.c:242 rpm.c:251
+#: rpm.c:244 rpm.c:253 rpm.c:262
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <sunucu>] [--ftpport <port>]"
 
-#: rpm.c:234 rpm.c:244
+#: rpm.c:245 rpm.c:255
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate eskidizin=yenidizin]"
 
-#: rpm.c:235
+#: rpm.c:246
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:236
+#: rpm.c:247
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:237
+#: rpm.c:248
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:238
+#: rpm.c:249
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <dizin>] [--noscripts]"
 
-#: rpm.c:239
+#: rpm.c:250
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <dosya>]"
 
-#: rpm.c:240
+#: rpm.c:251
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <dizin>] [--prefix "
 "<dizin>] "
 
-#: rpm.c:241
+#: rpm.c:252
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <sunucu>] [--ftpport <port>]"
 
-#: rpm.c:243
+#: rpm.c:254
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:245
+#: rpm.c:256
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:246
+#: rpm.c:257
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:247
+#: rpm.c:258
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:248
+#: rpm.c:259
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpm.c:249
+#: rpm.c:260
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:261
 #, fuzzy
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
@@ -334,7 +335,7 @@ msgstr ""
 "                        [--ftpuseport] [--ftpproxy <sunucu>] [--ftpport "
 "<port>]"
 
-#: rpm.c:252
+#: rpm.c:263
 #, fuzzy
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
@@ -342,314 +343,348 @@ msgstr ""
 "                        [--dbpath <dizin>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:253
+#: rpm.c:264
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:254
+#: rpm.c:265
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpm.c:255
+#: rpm.c:266
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <dizin>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:256
+#: rpm.c:267
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:257
+#: rpm.c:268
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [target]"
 
-#: rpm.c:258
+#: rpm.c:269
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [target]"
 
-#: rpm.c:259
+#: rpm.c:270
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:260
+#: rpm.c:271
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
 
-#: rpm.c:261
+#: rpm.c:272
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <dizin>] [--nodeps] [--allmatches]"
 
-#: rpm.c:262
+#: rpm.c:273
 #, fuzzy
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr "                        [--justdb] paket1 ... paketN"
 
-#: rpm.c:263
+#: rpm.c:274
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<dosya>]"
 
-#: rpm.c:264
+#: rpm.c:275
 #, fuzzy
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 "                        [--sign] [--test] [--timecheck <s>] [--buildos <os>]"
 
-#: rpm.c:265
+#: rpm.c:276
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [targets]"
 
-#: rpm.c:266
+#: rpm.c:277
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 "                        [--buildarch <mimari>] [--rmsource] specdosyasý"
 
-#: rpm.c:267
+#: rpm.c:278
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr "       rpm {--rmsource} [--rcfile <dosya>] [-v] specdosyasý"
 
-#: rpm.c:268
+#: rpm.c:279
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
 
-#: rpm.c:269
+#: rpm.c:280
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 "       rpm {--recompile} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
 
-#: rpm.c:270
+#: rpm.c:281
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
-#: rpm.c:271
+#: rpm.c:282
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
-#: rpm.c:272
+#: rpm.c:283
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <dosya>]"
 
-#: rpm.c:273
+#: rpm.c:284
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paketN"
 
-#: rpm.c:274
+#: rpm.c:285
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <dosya>] [--dbpath <dizin>]"
 
-#: rpm.c:275
+#: rpm.c:286
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:309
-msgid "usage:"
+#: rpm.c:320
+#, fuzzy
+msgid "Usage:"
 msgstr "Kullaným:"
 
-#: rpm.c:311
+#: rpm.c:322
 msgid "print this message"
 msgstr "Bu bilgiyi verir"
 
-#: rpm.c:313
+#: rpm.c:324
 msgid "print the version of rpm being used"
 msgstr "Kullanýlan RPM sürümünü verir"
 
-#: rpm.c:314
-msgid "   all modes support the following arguments:"
+#: rpm.c:327
+#, fuzzy
+msgid "   All modes support the following arguments:"
 msgstr "   tüm kipler aţađýdaki argümanlarý kabul ederler:"
 
-#: rpm.c:315
-msgid "      --rcfile <file>     "
+#: rpm.c:328
+msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:316
-msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
-msgstr "/etc/rpmrc ve $HOME/.rpmrc yerine <dosya> kullanýn"
-
-#: rpm.c:318
-msgid "be a little more verbose"
-msgstr "daha çok açýklama verir"
+#: rpm.c:329
+msgid "define macro <name> with value <body>"
+msgstr ""
 
-#: rpm.c:320
-msgid "be incredibly verbose (for debugging)"
-msgstr "çok fazla açýklama verir (hata ayýklama için)"
+#: rpm.c:330
+#, fuzzy
+msgid "    --eval '<name>+'      "
+msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:322
-msgid "query mode"
-msgstr "Sorgulama kipi"
+#: rpm.c:331
+#, fuzzy
+msgid "print the expansion of macro <name> to stdout"
+msgstr "Kullanýlan RPM sürümünü verir"
 
-#: rpm.c:323 rpm.c:385 rpm.c:449 rpm.c:477
-msgid "      --root <dir>        "
-msgstr ""
+#: rpm.c:332
+#, fuzzy
+msgid "    --pipe <cmd>          "
+msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:324 rpm.c:386 rpm.c:450 rpm.c:478 rpm.c:540
-msgid "use <dir> as the top level directory"
-msgstr "kök (baţlangýç) dizini olarak <dizin> kullanýlýr"
+#: rpm.c:333
+msgid "send stdout to <cmd>"
+msgstr "standart çýktýyý <KOMUT>'a gönderir"
 
-#: rpm.c:325 rpm.c:383 rpm.c:413 rpm.c:465 rpm.c:537
+#: rpm.c:334
 #, fuzzy
-msgid "      --dbpath <dir>      "
+msgid "    --rcfile <file>       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:326 rpm.c:384 rpm.c:414 rpm.c:466 rpm.c:538
-msgid "use <dir> as the directory for the database"
-msgstr "Veritabaný dizini olarak <dizin> kullanýlýr"
+#: rpm.c:335
+msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
+msgstr "/etc/rpmrc ve $HOME/.rpmrc yerine <dosya> kullanýn"
 
-#: rpm.c:327
-msgid "      --queryformat <qfmt>"
+#: rpm.c:337
+msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:328
-#, fuzzy
-msgid "use <qfmt> as the header format (implies -i)"
-msgstr "'header format' olarak s kullanýlýr (-i'yi gerektirir)"
+#: rpm.c:339
+msgid "be a little more verbose"
+msgstr "daha çok açýklama verir"
 
-#: rpm.c:329
-msgid ""
-"   install, upgrade and query (with -p) allow ftp URL's to be used in place"
+#: rpm.c:341
+msgid "be incredibly verbose (for debugging)"
+msgstr "çok fazla açýklama verir (hata ayýklama için)"
+
+#: rpm.c:344
+#, fuzzy
+msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   yükleme, güncelleme ve sorgulama (-p ile) iţlemlerimde dosya isimleri "
 
-#: rpm.c:330
+#: rpm.c:345
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr "   yerine FTP adreslerini aţađýdaki seçeneklerle kabul eder:\n"
 
-#: rpm.c:331
+#: rpm.c:346
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:347
 msgid "hostname or IP of ftp proxy"
 msgstr "Makina ismi veya FTP-Proxy'nin IP numarasý"
 
-#: rpm.c:333
+#: rpm.c:348
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:349
 msgid "port number of ftp server (or proxy)"
 msgstr "FTP sunucusunun (ya da Proxy'nin) port numarasý"
 
-#: rpm.c:335
+#: rpm.c:350
 #, fuzzy
-msgid "      --httpproxy <host>   "
+msgid "      --httpproxy <host>  "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:336
+#: rpm.c:351
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "Makina ismi veya FTP-Proxy'nin IP numarasý"
 
-#: rpm.c:337
+#: rpm.c:352
 #, fuzzy
-msgid "      --httpport <port>    "
+msgid "      --httpport <port>   "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:338
+#: rpm.c:353
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "FTP sunucusunun (ya da Proxy'nin) port numarasý"
 
-#: rpm.c:339
+#: rpm.c:357
+msgid "query mode"
+msgstr "Sorgulama kipi"
+
+#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+#, fuzzy
+msgid "      --dbpath <dir>      "
+msgstr "    -b<adým> <spec>      "
+
+#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+msgid "use <dir> as the directory for the database"
+msgstr "Veritabaný dizini olarak <dizin> kullanýlýr"
+
+#: rpm.c:360
+msgid "      --queryformat <qfmt>"
+msgstr ""
+
+#: rpm.c:361
+#, fuzzy
+msgid "use <qfmt> as the header format (implies --info)"
+msgstr "'header format' olarak s kullanýlýr (-i'yi gerektirir)"
+
+#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+msgid "      --root <dir>        "
+msgstr ""
+
+#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+msgid "use <dir> as the top level directory"
+msgstr "kök (baţlangýç) dizini olarak <dizin> kullanýlýr"
+
+#: rpm.c:364
 msgid "      Package specification options:"
 msgstr "      Paket seçim seçenekleri:"
 
-#: rpm.c:341
+#: rpm.c:366
 msgid "query all packages"
 msgstr "Tüm paketleri sorgulama"
 
-#: rpm.c:342
+#: rpm.c:367
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:368
 msgid "query package owning <file>"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: rpm.c:344
+#: rpm.c:369
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:345
+#: rpm.c:370
 msgid "query (uninstalled) package <packagefile>"
 msgstr "(henüz yüklenmemiţ) <paket dosyasý> paketi sorgulama"
 
-#: rpm.c:346
+#: rpm.c:371
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: rpm.c:347
+#: rpm.c:372
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: rpm.c:348
+#: rpm.c:373
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "        --requires"
 
-#: rpm.c:349
+#: rpm.c:374
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "<i> yeteneđi olan paketleri sorgulama"
 
-#: rpm.c:350
+#: rpm.c:375
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "        --requires"
 
-#: rpm.c:351
+#: rpm.c:376
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "<i> yeteneđine ihtiyaç duyan paketleri sorgulama"
 
-#: rpm.c:352
+#: rpm.c:377
 msgid "      Information selection options:"
 msgstr "      Bilgilendirme seçenekleri:"
 
-#: rpm.c:354
+#: rpm.c:379
 msgid "display package information"
 msgstr "Paket bilgisini gösterme"
 
-#: rpm.c:356
+#: rpm.c:381
 msgid "display the package's change log"
 msgstr "Paketin 'Change Log' (deđiţiklik) bilgisini gösterme"
 
-#: rpm.c:358
+#: rpm.c:383
 msgid "display package file list"
 msgstr "Paketin içerdiđi dosyalarý gösterme"
 
-#: rpm.c:360
+#: rpm.c:385
 msgid "show file states (implies -l)"
 msgstr "dosyalarýn durumunu gösterir (-l gerektirir)"
 
-#: rpm.c:362
+#: rpm.c:387
 msgid "list only documentation files (implies -l)"
 msgstr "sadece belge dosyalarýný gösterir (-l gerektirir)"
 
-#: rpm.c:364
+#: rpm.c:389
 msgid "list only configuration files (implies -l)"
 msgstr ""
 "sadece yapýlandýrma (configuration) dosyalarýný gösterir (impliziert -l)"
 
-#: rpm.c:366
+#: rpm.c:391
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -657,207 +692,183 @@ msgstr ""
 "her dosya için dođrulanabilir bilgileri göster (-l, -c veya -d ile "
 "kullanýlmalý)"
 
-#: rpm.c:368
+#: rpm.c:393
 msgid "list capabilities package provides"
 msgstr "paketin sađladýđý yetenekleri sýralar"
 
-#: rpm.c:369
-msgid "        --requires"
-msgstr "        --requires"
-
-#: rpm.c:371
+#: rpm.c:395
 msgid "list package dependencies"
 msgstr "paketin bađýmlýlýklarýný (gerektirdiđi paketleri) gösterir"
 
-#: rpm.c:373
+#: rpm.c:397
 msgid "print the various [un]install scripts"
 msgstr "paketin çeţitli yükleme, silme betiklerini (scripts) gösterir"
 
-#: rpm.c:375
+#: rpm.c:399
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:379
-#, fuzzy
-msgid "    --pipe <cmd>          "
-msgstr "    -b<adým> <spec>      "
-
-#: rpm.c:380
-msgid "send stdout to <cmd>"
-msgstr "standart çýktýyý <KOMUT>'a gönderir"
-
-#: rpm.c:382
+#: rpm.c:403
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "paketi -q ile belirtilen paket parametrelerini kullanarak dođrula"
 
-#: rpm.c:388 rpm.c:436 rpm.c:470
+#: rpm.c:409 rpm.c:451 rpm.c:486
 msgid "do not verify package dependencies"
 msgstr "paket bađýmlýlýklarýný dođrulamaz"
 
-#: rpm.c:390
+#: rpm.c:411
 msgid "do not verify file md5 checksums"
 msgstr "dosyalarýn 'md5-checksum' larýný dođrulamaz"
 
-#: rpm.c:392
+#: rpm.c:413
 msgid "do not verify file attributes"
 msgstr "dosya özelliklerini dođrulamaz"
 
-#: rpm.c:395
-msgid ""
-"set the file permissions to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"dosya eriţim haklarýný veri tabanýnda yer alanlarla -q ile belirtilen paket "
-"parametrelerini kullanarak güncelle"
-
-#: rpm.c:398
-msgid ""
-"set the file owner and group to those in the package database using the same "
-"package specification options as -q"
-msgstr ""
-"dosya kullanýcý ve grup bilgilerini veri tabanýnda yer alanlarla -q ile "
-"belirtilen paket parametrelerini kullanarak güncelle"
+#: rpm.c:415
+msgid "list the tags that can be used in a query format"
+msgstr "sorgulama sýrasýnda kullanýlabilecek 'Tag'leri sýralar"
 
-#: rpm.c:402
+#: rpm.c:418
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "paket yüklemek"
 
-#: rpm.c:403
+#: rpm.c:419
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:404
+#: rpm.c:420
 msgid "install package"
 msgstr "paket yüklemek"
 
-#: rpm.c:405
+#: rpm.c:421
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
 
-#: rpm.c:406
+#: rpm.c:422
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:407
+#: rpm.c:423
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
 
-#: rpm.c:408
+#: rpm.c:424
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
 
-#: rpm.c:410
-msgid "relocate files even though the package doesn't allow it"
-msgstr "paket desteklemese bile dosyalarý relocate et"
+#: rpm.c:426
+#, fuzzy
+msgid "relocate files in non-relocateable package"
+msgstr "%s pakedi yüklenmemiţ\n"
 
-#: rpm.c:411
+#: rpm.c:427
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:412
+#: rpm.c:428
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "paketin yerini (eđer deđitirilebiliyorsa) <dizin>'e deđiţtirir"
 
-#: rpm.c:416
+#: rpm.c:432
 msgid "do not install documentation"
 msgstr "yazýlýmýn belgelerini yüklemez"
 
-#: rpm.c:418
+#: rpm.c:434
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs --replacefiles'ýn kýsaltmasý"
 
-#: rpm.c:421
+#: rpm.c:436
 msgid "print hash marks as package installs (good with -v)"
 msgstr "yükleme sýrasýnda bir gösterge çýkarýr (-v seçeneđi ile iyi)"
 
-#: rpm.c:423
+#: rpm.c:438
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "tüm dosyalarý, hatta normal olarak atlanabilecek yapýlandýrmalarý bile,yükler"
 
-#: rpm.c:426
+#: rpm.c:441
 msgid "don't verify package architecture"
 msgstr "paket mimarisini dođrulamaz"
 
-#: rpm.c:428
+#: rpm.c:443
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:430
+#: rpm.c:445
 msgid "don't verify package operating system"
 msgstr "paketin ait olduđu iţletim sistemini dođrulamaz"
 
-#: rpm.c:432
+#: rpm.c:447
 msgid "install documentation"
 msgstr "paket ile gelen belgeleri de yükler"
 
-#: rpm.c:434 rpm.c:468
+#: rpm.c:449 rpm.c:484
 msgid "update the database, but do not modify the filesystem"
 msgstr "veri tabanýný günceller, ama dosya sistemini deđiţtirmez"
 
-#: rpm.c:438 rpm.c:472
+#: rpm.c:453 rpm.c:488
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "paket yükleme sýrasýný bađýmlýlýklara göre düzenleme"
 
-#: rpm.c:440
+#: rpm.c:455
 msgid "don't execute any installation scripts"
 msgstr "yükleme betiklerini (scripts) çalýţtýrmaz."
 
-#: rpm.c:442 rpm.c:476
+#: rpm.c:457 rpm.c:492
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:444
+#: rpm.c:459
 msgid "print percentages as package installs"
 msgstr "yükleme sýrasýnda geliţme yüzde olarak gösterilir"
 
-#: rpm.c:446
+#: rpm.c:461
 msgid "install even if the package replaces installed files"
 msgstr "paket mevcut dosyalarý silse bile paketi yükler"
 
-#: rpm.c:448
+#: rpm.c:463
 msgid "reinstall if the package is already present"
 msgstr "paket mevcutsa yeniden yükler"
 
-#: rpm.c:452
+#: rpm.c:467
 msgid "don't install, but tell if it would work or not"
 msgstr "yükleme yapmaz, sadece çalýţýp çalýţmayacađýný belirtir"
 
-#: rpm.c:454
+#: rpm.c:470
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:471
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:456
+#: rpm.c:472
 msgid "upgrade package (same options as --install, plus)"
 msgstr "Paketi günceller (seçenekler --install ile ayný, ek olarak)"
 
-#: rpm.c:458
+#: rpm.c:474
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 "pakedin eski bir sürüme güncellenmesini sađlar (--force ayný iţi görür)"
 
-#: rpm.c:460
+#: rpm.c:476
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:462
+#: rpm.c:478
 msgid "erase (uninstall) package"
 msgstr "paketi siler (uninstall)"
 
-#: rpm.c:464
+#: rpm.c:480
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -865,97 +876,98 @@ msgstr ""
 "<paket> ile eţlenen tüm paketleri siler (birden fazla paket eţlenirse bir "
 "hata mesajý çýkmasý gerekir)"
 
-#: rpm.c:474
+#: rpm.c:490
 msgid "do not execute any package specific scripts"
 msgstr "pakete ait hiçbir betik (Script) çalýţtýrýlmaz"
 
-#: rpm.c:480
+#: rpm.c:496
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:481
+#: rpm.c:497
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:482
+#: rpm.c:498
 msgid "build package, where <stage> is one of:"
 msgstr "paket yaratýr, <adým> aţađýdaki harflerden biridir:"
 
-#: rpm.c:484
+#: rpm.c:500
 msgid "prep (unpack sources and apply patches)"
 msgstr "hazýrlama (kaynaklar açýlýr ve yamalar uygulanýr)"
 
 # , c-format
-#: rpm.c:486
+#: rpm.c:502
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrol ( %files üstünkörü bir kontrol edilir)"
 
-#: rpm.c:488
+#: rpm.c:504
 msgid "compile (prep and compile)"
 msgstr "derleme (hazýrlama ve derleme)"
 
-#: rpm.c:490
+#: rpm.c:506
 msgid "install (prep, compile, install)"
 msgstr "yükleme (hazýrlama, derleme, yükleme)"
 
-#: rpm.c:492
+#: rpm.c:508
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 "çalýţtýrýlabilir paket yaratma (hazýrlama, derleme, yükleme, paketleme)"
 
-#: rpm.c:494
+#: rpm.c:510
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "çalýţtýrýlabilir ve Kaynak paket yaratmak (hazýrlama, derleme, yükleme "
 "vepaketleme)"
 
-#: rpm.c:500
-msgid "remove sources and spec file when done"
+#: rpm.c:518
+#, fuzzy
+msgid "remove spec file when done"
 msgstr "iţlem sonunda kaynaklarý ve spec dosyasýný siler"
 
-#: rpm.c:502
+#: rpm.c:520
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP-imzasý yaratýr"
 
-#: rpm.c:503
+#: rpm.c:521
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:504
+#: rpm.c:522
 msgid "use <dir> as the build root"
 msgstr "paket yaratýlýrken <dizin> baţlangýç dizini olarak kullanýlýr"
 
-#: rpm.c:505
+#: rpm.c:523
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:524
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:526
 msgid "do not execute any stages"
 msgstr "adýmlarýn hiçbirini çalýţtýrmaz"
 
-#: rpm.c:509
+#: rpm.c:527
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:510
+#: rpm.c:528
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "zaman kontrolünü S saniyeye ayarlar (0 ile tümüyle kaldýrýr)"
 
-#: rpm.c:512
+#: rpm.c:530
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:513
+#: rpm.c:531
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -963,239 +975,247 @@ msgstr ""
 "kaynak paketini yükler, çalýţýr paketi oluţturur ve spec dosyasý, kaynaklar "
 "ile yamalarý siler"
 
-#: rpm.c:514
-#, fuzzy
-msgid "    --rmsource <spec>     "
-msgstr "    -b<adým> <spec>      "
-
-#: rpm.c:515
-msgid "remove sources and spec file"
-msgstr "kaynak dosyalarýný ve spec dosyasýný siler"
-
-#: rpm.c:516
+#: rpm.c:532
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:517
+#: rpm.c:533
 msgid "like --rebuild, but don't build any package"
 msgstr "--rebuild gibi, ama paket yaratmaz"
 
-#: rpm.c:518
+#: rpm.c:536
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:519
+#: rpm.c:537
 msgid "sign a package (discard current signature)"
 msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
 
-#: rpm.c:520
+#: rpm.c:538
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:521
+#: rpm.c:539
 msgid "add a signature to a package"
 msgstr "pakete bir imza ekler"
 
-#: rpm.c:523
+#: rpm.c:540
 #, fuzzy
-msgid "    --checksig <pkg>+     "
+msgid "    --checksig <pkg>+"
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:524
+#: rpm.c:541
+#, fuzzy
+msgid "    -K <pkg>+           "
+msgstr "    -b<adým> <spec>      "
+
+#: rpm.c:542
 msgid "verify package signature"
 msgstr "paket imzasýný dođrular"
 
-#: rpm.c:526
+#: rpm.c:544
 msgid "skip any PGP signatures"
 msgstr "tüm PGP imzalarýný atlar"
 
-#: rpm.c:528
+#: rpm.c:546
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "tüm PGP imzalarýný atlar"
 
-#: rpm.c:530
+#: rpm.c:548
 msgid "skip any MD5 signatures"
 msgstr "tüm MD5 imzalarýný atlar"
 
-#: rpm.c:532
-msgid "list the tags that can be used in a query format"
-msgstr "sorgulama sýrasýnda kullanýlabilecek 'Tag'leri sýralar"
-
-#: rpm.c:534
+#: rpm.c:552
 msgid "make sure a valid database exists"
 msgstr "geçerli bir veri tabaný olmasýný sađlar"
 
-#: rpm.c:536
+#: rpm.c:554
 msgid "rebuild database from existing database"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluţturur"
 
-#: rpm.c:689 rpm.c:695 rpm.c:702 rpm.c:708 rpm.c:717 rpm.c:724 rpm.c:771
-#: rpm.c:777 rpm.c:811 rpm.c:817 rpm.c:823 rpm.c:831 rpm.c:877 rpm.c:932
-#: rpm.c:939
+#: rpm.c:562
+msgid ""
+"set the file permissions to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"dosya eriţim haklarýný veri tabanýnda yer alanlarla -q ile belirtilen paket "
+"parametrelerini kullanarak güncelle"
+
+#: rpm.c:565
+msgid ""
+"set the file owner and group to those in the package database using the same "
+"package specification options as -q"
+msgstr ""
+"dosya kullanýcý ve grup bilgilerini veri tabanýnda yer alanlarla -q ile "
+"belirtilen paket parametrelerini kullanarak güncelle"
+
+#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
+#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
+#: rpm.c:974
 msgid "only one major mode may be specified"
 msgstr "sadece bir ana kip (major mode) belirtilebilir"
 
-#: rpm.c:710
+#: rpm.c:740
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ve --uninstall komutlarý eskidirler ve çalýţmamaktadýrlar.\n"
 
-#: rpm.c:712
+#: rpm.c:742
 msgid "Use -e or --erase instead.\n"
 msgstr "Yerine  -e veya --erase komutunu kullanýn\n"
 
-#: rpm.c:728
+#: rpm.c:758
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "--build (-b) tek argüman olarak a,b,i,c,p,l harflerinden birini kabul eder"
 
-#: rpm.c:732
+#: rpm.c:762
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 "--tarbuild (-t) tek argüman olarak a,b,i,c,p,l harflerinden birini kabul eder"
 
-#: rpm.c:784 rpm.c:790 rpm.c:797 rpm.c:804 rpm.c:946
+#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
 msgid "one type of query/verify may be performed at a time"
 msgstr "bir anda sadece bir tarz sorgulama veya dođrulama yapýlabilir"
 
-#: rpm.c:841
+#: rpm.c:872
 msgid "arguments to --dbpath must begin with a /"
 msgstr "--dbpath için verilen argümanlar '/' ile baţlamalý"
 
-#: rpm.c:883
+#: rpm.c:918
 msgid "relocations must begin with a /"
 msgstr "relocate iţlemi / ile baţlamalý"
 
-#: rpm.c:885
+#: rpm.c:920
 msgid "relocations must contain a ="
 msgstr "relocate satýrýnda = bulunmalý"
 
-#: rpm.c:888
+#: rpm.c:923
 msgid "relocations must have a / following the ="
 msgstr "relocate için = den sonra bir / gerekir"
 
-#: rpm.c:897
+#: rpm.c:932
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "relocate iţlemi / ile baţlamalý"
 
-#: rpm.c:906
+#: rpm.c:941
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:957
+#: rpm.c:993
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath veritabaný kullanýlmayan bir iţlemde belirtildi"
 
-#: rpm.c:961
+#: rpm.c:997
 msgid "--timecheck may only be used during package builds"
 msgstr "--timecheck sadece paket oluţturulurken kullanýlabilir"
 
-#: rpm.c:964
+#: rpm.c:1001
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "beklenmeyen sorgulama kaynađý girildi"
 
-#: rpm.c:967
+#: rpm.c:1004
 #, fuzzy
 msgid "unexpected query format"
 msgstr "beklenmeyen sorgulama kaynađý girildi"
 
-#: rpm.c:970
+#: rpm.c:1007
 msgid "unexpected query source"
 msgstr "beklenmeyen sorgulama kaynađý girildi"
 
-#: rpm.c:976
+#: rpm.c:1013
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "sadece yükleme ve güncelleme zorlanabilir (force edilebilir)"
 
-#: rpm.c:979
+#: rpm.c:1016
 msgid "files may only be relocated during package installation"
 msgstr "dosyalar sadece paket yüklemesi sýrasýnda relocate edilebilir"
 
-#: rpm.c:982
+#: rpm.c:1019
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir"
 
-#: rpm.c:985
+#: rpm.c:1022
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate sadece yeni paketler yüklenirken kullanýlýr"
 
-#: rpm.c:988
+#: rpm.c:1025
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix sadece yeni paketlerin yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:991
+#: rpm.c:1028
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix komutunun argümanlarý '/' ile baţlamalý"
 
-#: rpm.c:994
+#: rpm.c:1031
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:998
+#: rpm.c:1035
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1002
+#: rpm.c:1039
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1006
+#: rpm.c:1043
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1010
+#: rpm.c:1047
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1014
+#: rpm.c:1051
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1018
+#: rpm.c:1055
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "--excludedocs ve --includedocs bir arada kullanýlamaz (bi daha olmasýn)"
 
-#: rpm.c:1022
+#: rpm.c:1059
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1026
+#: rpm.c:1063
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1030
+#: rpm.c:1067
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1034
+#: rpm.c:1071
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sadece paket silinmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1038
+#: rpm.c:1075
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:1042
+#: rpm.c:1079
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sadece paket yükleme ve silmelerinde kullanýlýr"
 
-#: rpm.c:1047
+#: rpm.c:1084
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr "--noscripts sadece paket yükleme, silme ve dođrulamalarýnda kullanýlýr"
 
-#: rpm.c:1051
+#: rpm.c:1088
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1203,7 +1223,7 @@ msgid ""
 msgstr ""
 "--nodeps sadece paket yüklemelerinde, silme ve dođrulamalarda kullanýlýr"
 
-#: rpm.c:1055
+#: rpm.c:1092
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1211,13 +1231,13 @@ msgid ""
 msgstr ""
 "--nodeps sadece paket yüklemelerinde, silme ve dođrulamalarda kullanýlýr"
 
-#: rpm.c:1060
+#: rpm.c:1097
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test sadece paket yüklemelerinde, silme ve derlemelerinde kullanýlýr"
 
-#: rpm.c:1064
+#: rpm.c:1101
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1225,126 +1245,126 @@ msgstr ""
 "--root (-r) sadece yükleme, silme, sorgulama ve veritabaný güncellemelerinde "
 "kullanýlýr"
 
-#: rpm.c:1076
+#: rpm.c:1113
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) komutun argümanlarý '/' ile baţlamalý"
 
-#: rpm.c:1082
+#: rpm.c:1119
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage sadece güncelleme sýrasýnda kullanýlabilir"
 
-#: rpm.c:1087
+#: rpm.c:1125
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr "FTP seçenekleri sadece sorgulama, yükleme ve güncellemede kullanýlýr"
 
-#: rpm.c:1093
+#: rpm.c:1131
 #, fuzzy
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr "FTP seçenekleri sadece sorgulama, yükleme ve güncellemede kullanýlýr"
 
-#: rpm.c:1097
+#: rpm.c:1136
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp sadece Ýmza kontrolü sýrasýnda kullanýlabilir"
 
-#: rpm.c:1100
+#: rpm.c:1139
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp sadece Ýmza kontrolü sýrasýnda kullanýlabilir"
 
-#: rpm.c:1103
+#: rpm.c:1142
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nopgp sadece imza kontrolü veya paket dođrulamasý sýrasýnda kullanýlýr"
 
-#: rpm.c:1131
+#: rpm.c:1172
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1136
+#: rpm.c:1177
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: rpm.c:1151
+#: rpm.c:1192
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Dosya sunucuda bulunamadý"
 
-#: rpm.c:1155
+#: rpm.c:1196
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1157
+#: rpm.c:1198
 msgid "Pass phrase check failed\n"
 msgstr "Parola kontrolü baţarýsýzlýkla sonuçlandý\n"
 
-#: rpm.c:1160
+#: rpm.c:1201
 msgid "Pass phrase is good.\n"
 msgstr "Parola dođru.\n"
 
-#: rpm.c:1165
+#: rpm.c:1206
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1171
+#: rpm.c:1212
 msgid "--sign may only be used during package building"
 msgstr "--sign sadece paket olusturulurken kullanýlabilir"
 
-#: rpm.c:1186
+#: rpm.c:1227
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Eriţilemedi\n"
 
-#: rpm.c:1205
+#: rpm.c:1246
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags için beklenmeyen argümanlar"
 
-#: rpm.c:1216
+#: rpm.c:1257
 msgid "no packages given for signature check"
 msgstr "imzasý kontrol edilecek paketler belirtilmedi"
 
-#: rpm.c:1227
+#: rpm.c:1268
 msgid "no packages given for signing"
 msgstr "imzalanacak paketler belirtilmedi"
 
-#: rpm.c:1239
+#: rpm.c:1280
 msgid "no packages files given for rebuild"
 msgstr "yeniden oluţturmak için paket dosyalarý belirtilmedi"
 
-#: rpm.c:1302
+#: rpm.c:1343
 msgid "no spec files given for build"
 msgstr "oluţturma için gerekli spec dosyasý belirtilmedi"
 
-#: rpm.c:1304
+#: rpm.c:1345
 msgid "no tar files given for build"
 msgstr "oluţturma için gereken tar dosyalarý belirttilmedi"
 
-#: rpm.c:1320
+#: rpm.c:1361
 msgid "no packages given for uninstall"
 msgstr "sistemden silinecek paketler belirtilmedi"
 
-#: rpm.c:1370
+#: rpm.c:1411
 msgid "no packages given for install"
 msgstr "yüklenecek paketler belirtilmedi"
 
-#: rpm.c:1393
+#: rpm.c:1434
 msgid "extra arguments given for query of all packages"
 msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
 
-#: rpm.c:1398
+#: rpm.c:1439
 msgid "no arguments given for query"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: rpm.c:1415
+#: rpm.c:1456
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
 
-#: rpm.c:1419
+#: rpm.c:1460
 msgid "no arguments given for verify"
 msgstr "dođrulama için hiç argüman belirtilmedi"
 
@@ -3738,6 +3758,22 @@ msgstr "% den sonra eksik {"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s 'nin bađýmlýlýk sorunlarý: "
 
+#~ msgid "        --requires"
+#~ msgstr "        --requires"
+
+#~ msgid "relocate files even though the package doesn't allow it"
+#~ msgstr "paket desteklemese bile dosyalarý relocate et"
+
+#~ msgid "remove sources and spec file when done"
+#~ msgstr "iţlem sonunda kaynaklarý ve spec dosyasýný siler"
+
+#, fuzzy
+#~ msgid "    --rmsource <spec>     "
+#~ msgstr "    -b<adým> <spec>      "
+
+#~ msgid "remove sources and spec file"
+#~ msgstr "kaynak dosyalarýný ve spec dosyasýný siler"
+
 #, fuzzy
 #~ msgid "%s: %s satisfied by added package (shouldn't happen).\n"
 #~ msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
diff --git a/popt/findme.c b/popt/findme.c
index 6d1b41c18..8518be13c 100644
--- a/popt/findme.c
+++ b/popt/findme.c
@@ -11,15 +11,14 @@ const char * findProgramPath(const char * argv0) {
     char * start, * chptr;
     char * buf;
 
-    /* If there is a / in the argv[0], it has to be an absolute
-       path */
+    /* If there is a / in the argv[0], it has to be an absolute path */
     if (strchr(argv0, '/'))
 	return xstrdup(argv0);
 
     if (!path) return NULL;
 
     start = pathbuf = alloca(strlen(path) + 1);
-    buf = malloc(strlen(path) + strlen(argv0) + 2);
+    buf = malloc(strlen(path) + strlen(argv0) + sizeof("/"));
     strcpy(pathbuf, path);
 
     chptr = NULL;
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index dc108e199..49ad01ee1 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-22 14:29-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/ro.po b/popt/po/ro.po
index a9dd784ec..3cbf5752b 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 2000-04-22 14:29-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index fa860e3a6..37466a2b7 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-04-22 14:29-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index 3eb8394c2..7e5c3db6d 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-04-22 14:29-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
diff --git a/popt/popt.c b/popt/popt.c
index 43de9f614..0706ccc0d 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -2,6 +2,8 @@
    file accompanying popt source distributions, available from
    ftp://ftp.redhat.com/pub/code/popt */
 
+#undef	MYDEBUG
+
 #include "system.h"
 #include "findme.h"
 #include "poptint.h"
@@ -218,37 +220,43 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
 
 static void execCommand(poptContext con) {
     const char ** argv;
-    int pos = 0;
-    const char * script = con->doExec->script;
+    int argc = 0;
+    const char ** sargv;
+    int sargc = 0;
 
-    argv = malloc(sizeof(*argv) *
-			(6 + con->numLeftovers + con->finalArgvCount));
+    poptParseArgvString(con->doExec->script, &sargc, &sargv);
 
-    if (!con->execAbsolute && strchr(script, '/')) return;
+    if (sargv == NULL || sargc < 1 ||
+	(!con->execAbsolute && strchr(sargv[0], '/')))
+	    return;
 
-    if (!strchr(script, '/') && con->execPath) {
-	char *s = alloca(strlen(con->execPath) + strlen(script) + 2);
-	sprintf(s, "%s/%s", con->execPath, script);
-	argv[pos] = s;
+    argv = malloc(sizeof(*argv) *
+			(6 + sargc + con->numLeftovers + con->finalArgvCount));
+
+    if (!strchr(sargv[0], '/') && con->execPath) {
+	char *s = alloca(strlen(con->execPath) + strlen(sargv[0]) + sizeof("/"));
+	sprintf(s, "%s/%s", con->execPath, sargv[0]);
+	argv[argc] = s;
     } else {
-	argv[pos] = script;
+	argv[argc] = findProgramPath(sargv[0]);
     }
-    pos++;
+    if (argv[argc++] == NULL) return;
 
-    argv[pos] = findProgramPath(con->os->argv[0]);
-    if (argv[pos]) pos++;
-    argv[pos++] = ";";
+    if (sargc > 1) {
+	memcpy(argv + argc, sargv + 1, sizeof(*argv) * (sargc - 1));
+	argc += (sargc - 1);
+    }
 
-    memcpy(argv + pos, con->finalArgv, sizeof(*argv) * con->finalArgvCount);
-    pos += con->finalArgvCount;
+    memcpy(argv + argc, con->finalArgv, sizeof(*argv) * con->finalArgvCount);
+    argc += con->finalArgvCount;
 
     if (con->numLeftovers) {
-	argv[pos++] = "--";
-	memcpy(argv + pos, con->leftovers, sizeof(*argv) * con->numLeftovers);
-	pos += con->numLeftovers;
+	argv[argc++] = "--";
+	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
+	argc += con->numLeftovers;
     }
 
-    argv[pos++] = NULL;
+    argv[argc++] = NULL;
 
 #ifdef __hpux
     setresuid(getuid(), getuid(),-1);
@@ -267,6 +275,17 @@ static void execCommand(poptContext con) {
 #endif
 #endif
 
+    if (argv[0] == NULL)
+	return;
+#ifdef MYDEBUG
+    {	const char ** arg;
+	fprintf(stderr, "==> execvp(%s):", argv[0]);
+	for (arg = argv; *arg; arg++)
+	    fprintf(stderr, " %s", *arg);
+	fprintf(stderr, "\n");
+    }
+#endif
+
     execvp(argv[0], (char *const *)argv);
 }
 
@@ -386,7 +405,7 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
 
 static void poptStripArg(poptContext con, int which)
 {
-    if(con->arg_strip == NULL) {
+    if (con->arg_strip == NULL) {
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
     }
     PBM_SET(which, con->arg_strip);
@@ -438,6 +457,20 @@ static int poptSaveInt(const struct poptOption * opt, long aLong) {
     return 0;
 }
 
+#ifdef MYDEBUG
+static void prtcon(const char *msg, poptContext con)
+{
+    if (msg) fprintf(stderr, "%s", msg);
+    fprintf(stderr, "\tcon %p os %p nextCharArg %p \"%s\" argv[%d] \"%s\"\n",
+	con, con->os,
+	con->os->nextCharArg,
+	(con->os->nextCharArg ? con->os->nextCharArg : ""),
+	con->os->next,
+	(con->os->argv && con->os->argv[con->os->next]
+		? con->os->argv[con->os->next] : ""));
+}
+#endif
+
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -470,7 +503,7 @@ int poptGetNextOpt(poptContext con)
 		con->os->next++;
 		continue;
 	    }
-	    thisopt=con->os->next;
+	    thisopt = con->os->next;
 	    origOptString = con->os->argv[con->os->next++];
 
 	    if (con->restLeftover || *origOptString != '-') {
@@ -525,7 +558,7 @@ int poptGetNextOpt(poptContext con)
 	    if (!opt) {
 		con->os->nextCharArg = origOptString + 1;
 	    } else {
-		if(con->os == con->optionStack &&
+		if (con->os == con->optionStack &&
 		   opt->argInfo & POPT_ARGFLAG_STRIP) {
 		    canstrip = 1;
 		    poptStripArg(con, thisopt);
@@ -541,11 +574,14 @@ int poptGetNextOpt(poptContext con)
 
 	    if (handleAlias(con, NULL, *origOptString,
 			    origOptString + 1)) {
-		origOptString++;
 		continue;
 	    }
-	    if (handleExec(con, NULL, *origOptString))
+	    if (handleExec(con, NULL, *origOptString)) {
+		/* Restore rest of short options for further processing */
+		origOptString++;
+		if (*origOptString) con->os->nextCharArg = origOptString;
 		continue;
+	    }
 
 	    opt = findOption(con->options, NULL, *origOptString, &cb,
 			     &cbData, 0);
@@ -553,8 +589,7 @@ int poptGetNextOpt(poptContext con)
 		return POPT_ERROR_BADOPT;
 
 	    origOptString++;
-	    if (*origOptString)
-		con->os->nextCharArg = origOptString;
+	    if (*origOptString) con->os->nextCharArg = origOptString;
 	}
 
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
@@ -585,7 +620,7 @@ int poptGetNextOpt(poptContext con)
 
 		/* make sure this isn't part of a short arg or the
                    result of an alias expansion */
-		if(con->os == con->optionStack &&
+		if (con->os == con->optionStack &&
 		   opt->argInfo & POPT_ARGFLAG_STRIP &&
 		   canstrip) {
 		    poptStripArg(con, con->os->next);
@@ -642,7 +677,7 @@ int poptGetNextOpt(poptContext con)
 			    sizeof(*con->finalArgv) * con->finalArgvAlloced);
 	}
 
-	{    char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
+	{   char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
 	    if (opt->longName)
 		sprintf(s, "--%s", opt->longName);
 	    else
@@ -650,8 +685,9 @@ int poptGetNextOpt(poptContext con)
 	    con->finalArgv[con->finalArgvCount++] = s;
 	}
 
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE
-		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) {
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
+	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    con->finalArgv[con->finalArgvCount++] = xstrdup(con->os->nextArg);
 	}
     }
@@ -800,16 +836,16 @@ int poptStrippedArgv(poptContext con, int argc, char **argv)
     int i,j=1, numargs=argc;
     
     for(i=1; i<argc; i++) {
-	if(PBM_ISSET(i, con->arg_strip)) {
+	if (PBM_ISSET(i, con->arg_strip)) {
 	    numargs--;
 	}
     }
     
     for(i=1; i<argc; i++) {
-	if(PBM_ISSET(i, con->arg_strip)) {
+	if (PBM_ISSET(i, con->arg_strip)) {
 	    continue;
 	} else {
-	    if(j<numargs) {
+	    if (j<numargs) {
 		argv[j++]=argv[i];
 	    } else {
 		argv[j++]='\0';
diff --git a/popt/testit.sh b/popt/testit.sh
index e9b7198aa..a3221761f 100755
--- a/popt/testit.sh
+++ b/popt/testit.sh
@@ -15,6 +15,7 @@ run() {
 }
 
 builddir=`pwd`
+srcdir=$builddir
 cd ${srcdir}
 test1=${builddir}/test1
 echo "Running tests in `pwd`"
@@ -39,11 +40,11 @@ run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
 POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
-run test1 "test1 - 19" "${test1} ;" --echo-args
-run test1 "test1 - 20" "${test1} ; --arg1" --echo-args --arg1
-run test1 "test1 - 21" "${test1} ; --arg2 something" -T something -e
-run test1 "test1 - 22" "${test1} ; --arg2 something -- more args" -T something -a more args
-run test1 "test1 - 23" "${test1} ; --echo-args -a" --echo-args -e -a
+run test1 "test1 - 19" "" --echo-args
+run test1 "test1 - 20" "--arg1" --echo-args --arg1
+run test1 "test1 - 21" "--arg2 something" -T something -e
+run test1 "test1 - 22" "--arg2 something -- more args" -T something -a more args
+run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
 run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
diff --git a/rpm.c b/rpm.c
index 291903c4b..1a69924d0 100755
--- a/rpm.c
+++ b/rpm.c
@@ -12,7 +12,9 @@
 #define GETOPT_ADDSIGN		1005
 #define GETOPT_RESIGN		1006
 #define GETOPT_DBPATH		1010
+#ifdef	DYING
 #define GETOPT_TIMECHECK        1012
+#endif
 #define GETOPT_REBUILDDB        1013
 #define GETOPT_INSTALL		1014
 #define GETOPT_RELOCATE		1016
@@ -45,7 +47,6 @@ enum modes {
 #define	MODES_K	 (MODE_CHECKSIG | MODES_RESIGN)
 
 #define	MODES_FOR_DBPATH	(MODES_BT | MODES_IE | MODES_QV | MODES_DB)
-#define	MODES_FOR_TIMECHECK	(MODES_BT)
 #define	MODES_FOR_NODEPS	(MODES_BT | MODES_IE | MODE_VERIFY)
 #define	MODES_FOR_TEST		(MODES_BT | MODES_IE)
 #define	MODES_FOR_ROOT		(MODES_BT | MODES_IE | MODES_QV | MODES_DB)
@@ -57,10 +58,12 @@ static int badReloc;
 static int excldocs;
 static int force;
 extern int _ftp_debug;
+#ifdef	DYING
 static char * ftpPort;
 static char * ftpProxy;
 static char * httpPort;
 static char * httpProxy;
+#endif
 static int showHash;
 static int help;
 static int ignoreArch;
@@ -116,7 +119,9 @@ static struct poptOption optionsTable[] = {
  { "badreloc", '\0', 0, &badReloc, 0,		NULL, NULL},
  { "build", 'b', POPT_ARG_STRING, 0, 'b',	NULL, NULL},
  { "checksig", 'K', 0, 0, 'K',			NULL, NULL},
+#ifdef	DYING
  { "dbpath", '\0', POPT_ARG_STRING, 0, GETOPT_DBPATH,		NULL, NULL},
+#endif
  { "define", '\0', POPT_ARG_STRING, 0, GETOPT_DEFINEMACRO,NULL, NULL},
  { "dirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 0,	NULL, NULL},
  { "erase", 'e', 0, 0, 'e',			NULL, NULL},
@@ -125,12 +130,16 @@ static struct poptOption optionsTable[] = {
  { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH,	NULL, NULL},
  { "force", '\0', 0, &force, 0,			NULL, NULL},
  { "ftpdebug", '\0', POPT_ARG_VAL, &_ftp_debug, -1,		NULL, NULL},
+#ifdef	DYING
  { "ftpport", '\0', POPT_ARG_STRING, &ftpPort, 0,	NULL, NULL},
  { "ftpproxy", '\0', POPT_ARG_STRING, &ftpProxy, 0,	NULL, NULL},
+#endif
  { "hash", 'h', 0, &showHash, 0,		NULL, NULL},
  { "help", '\0', 0, &help, 0,			NULL, NULL},
+#ifdef	DYING
  { "httpport", '\0', POPT_ARG_STRING, &httpPort, 0,	NULL, NULL},
  { "httpproxy", '\0', POPT_ARG_STRING, &httpProxy, 0,	NULL, NULL},
+#endif
  {  NULL, 'i', 0, 0, 'i',			NULL, NULL},
  { "ignorearch", '\0', 0, &ignoreArch, 0,	NULL, NULL},
  { "ignoreos", '\0', 0, &ignoreOs, 0,		NULL, NULL},
@@ -172,7 +181,9 @@ static struct poptOption optionsTable[] = {
  { "sign", '\0', 0, &signIt, 0,			NULL, NULL},
  { "tarbuild", 't', POPT_ARG_STRING, 0, 't',	NULL, NULL},
  { "test", '\0', 0, &test, 0,			NULL, NULL},
+#ifdef	DYING
  { "timecheck", '\0', POPT_ARG_STRING, 0, GETOPT_TIMECHECK,	NULL, NULL},
+#endif
  { "upgrade", 'U', 0, 0, 'U',			NULL, NULL},
  { "urldebug", '\0', POPT_ARG_VAL, &_url_debug, -1,		NULL, NULL},
  { "uninstall", 'u', 0, 0, 'u',			NULL, NULL},
@@ -221,7 +232,7 @@ static void printUsage(void) {
     printBanner();
     puts("");
 
-    puts(_("usage: rpm {--help}"));
+    puts(_("Usage: rpm {--help}"));
     puts(_("       rpm {--version}"));
     puts(_("       rpm {--initdb}   [--dbpath <dir>]"));
     puts(_("       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"));
@@ -306,38 +317,52 @@ static void printHelp(void) {
     printBanner();
     puts("");
 
-    puts(         _("usage:"));
+    puts(         _("Usage:"));
     printHelpLine(  "   --help                 ", 
 		  _("print this message"));
     printHelpLine(  "   --version              ",
 		  _("print the version of rpm being used"));
-    puts(         _("   all modes support the following arguments:"));
-    printHelpLine(_("      --rcfile <file>     "),
+
+    puts("");
+    puts(         _("   All modes support the following arguments:"));
+    printHelpLine(_("    --define '<name> <body>'"),
+		  _("define macro <name> with value <body>"));
+    printHelpLine(_("    --eval '<name>+'      "),
+		  _("print the expansion of macro <name> to stdout"));
+    printHelpLine(_("    --pipe <cmd>          "),
+		  _("send stdout to <cmd>"));
+    printHelpLine(_("    --rcfile <file>       "),
 		  _("use <file> instead of /etc/rpmrc and $HOME/.rpmrc"));
+    printHelpLine(  "    --showrc              ",
+		  _("display final rpmrc and macro configuration"));
     printHelpLine(  "     -v                   ",
 		  _("be a little more verbose"));
     printHelpLine(  "     -vv                  ",
 		  _("be incredibly verbose (for debugging)"));
-    printHelpLine(  "   -q                     ",
-		  _("query mode"));
-    printHelpLine(_("      --root <dir>        "),
-		  _("use <dir> as the top level directory"));
-    printHelpLine(_("      --dbpath <dir>      "),
-		  _("use <dir> as the directory for the database"));
-    printHelpLine(_("      --queryformat <qfmt>"),
-		  _("use <qfmt> as the header format (implies -i)"));
-    puts(         _("   install, upgrade and query (with -p) allow ftp URL's to be used in place"));
+
+    puts("");
+    puts(         _("   Install, upgrade and query (with -p) allow URL's to be used in place"));
     puts(         _("   of file names as well as the following options:"));
     printHelpLine(_("      --ftpproxy <host>   "),
 		  _("hostname or IP of ftp proxy"));
     printHelpLine(_("      --ftpport <port>    "),
 		  _("port number of ftp server (or proxy)"));
-    printHelpLine(_("      --httpproxy <host>   "),
+    printHelpLine(_("      --httpproxy <host>  "),
 		  _("hostname or IP of http proxy"));
-    printHelpLine(_("      --httpport <port>    "),
+    printHelpLine(_("      --httpport <port>   "),
 		  _("port number of http server (or proxy)"));
+
+    puts("");
+    printHelpLine(  "   -q, --query            ",
+		  _("query mode"));
+    printHelpLine(_("      --dbpath <dir>      "),
+		  _("use <dir> as the directory for the database"));
+    printHelpLine(_("      --queryformat <qfmt>"),
+		  _("use <qfmt> as the header format (implies --info)"));
+    printHelpLine(_("      --root <dir>        "),
+		  _("use <dir> as the top level directory"));
     puts(         _("      Package specification options:"));
-    printHelpLine(  "        -a                ",
+    printHelpLine(  "        -a, --all         ",
 		  _("query all packages"));
     printHelpLine(_("        -f <file>+        "),
 		  _("query package owning <file>"));
@@ -350,7 +375,7 @@ static void printHelp(void) {
     printHelpLine(_("        --whatrequires <cap>"),
 		  _("query packages which require <cap> capability"));
     puts(         _("      Information selection options:"));
-    printHelpLine(  "        -i                ",
+    printHelpLine(  "        -i, --info         ",
 		  _("display package information"));
     printHelpLine(  "        --changelog       ",
 		  _("display the package's change log"));
@@ -366,19 +391,15 @@ static void printHelp(void) {
 		  _("show all verifiable information for each file (must be used with -l, -c, or -d)"));
     printHelpLine(  "        --provides        ",
 		  _("list capabilities package provides"));
-    puts(         _("        --requires"));
-    printHelpLine(  "        -R                ",
+    printHelpLine(  "        -R, --requires    ",
 		  _("list package dependencies"));
     printHelpLine(  "        --scripts         ",
 		  _("print the various [un]install scripts"));
-    printHelpLine("          --triggers        ",
+    printHelpLine(  "        --triggers        ",
 		  _("show the trigger scripts contained in the package"));
+
     puts("");
-    puts(           "    -V");
-    puts(           "    -y");
-    printHelpLine(_("    --pipe <cmd>          "),
-		  _("send stdout to <cmd>"));
-    printHelpLine(  "    --verify              ",
+    printHelpLine(  "    -V, -y, --verify      ",
 		  _("verify a package installation using the same same package specification options as -q"));
     printHelpLine(_("      --dbpath <dir>      "),
 		  _("use <dir> as the directory for the database"));
@@ -390,14 +411,9 @@ static void printHelp(void) {
 		  _("do not verify file md5 checksums"));
     printHelpLine(  "      --nofiles           ",
 		  _("do not verify file attributes"));
-    puts("");
-    printHelpLine(  "    --setperms            ",
-		  _("set the file permissions to those in the package database"
-		    " using the same package specification options as -q"));
-    printHelpLine(  "    --setugids            ",
-		  _("set the file owner and group to those in the package "
-		    "database using the same package specification options as "
-		    "-q"));
+    printHelpLine(  "    --querytags           ",
+		  _("list the tags that can be used in a query format"));
+
     puts("");
     puts(         _("    --install <packagefile>"));
     printHelpLine(_("    -i <packagefile>      "),
@@ -406,8 +422,8 @@ static void printHelp(void) {
 		  _("skip files in path <path>"));
     printHelpLine(_("      --relocate <oldpath>=<newpath>"),
 		  _("relocate files from <oldpath> to <newpath>"));
-    printHelpLine(  "      --badreloc",
-		  _("relocate files even though the package doesn't allow it"));
+    printHelpLine(  "      --badreloc          ",
+		  _("relocate files in non-relocateable package"));
     printHelpLine(_("      --prefix <dir>      "),
 		  _("relocate the package to <dir>, if relocatable"));
     printHelpLine(_("      --dbpath <dir>      "),
@@ -416,8 +432,7 @@ static void printHelp(void) {
 		  _("do not install documentation"));
     printHelpLine(  "      --force             ",
 		  _("short hand for --replacepkgs --replacefiles"));
-    puts(           "      -h");
-    printHelpLine(  "      --hash              ",
+    printHelpLine(  "      -h, --hash          ",
 		  _("print hash marks as package installs (good with -v)"));
     printHelpLine(  "      --allfiles          ",
 		  _("install all files, even configurations which might "
@@ -450,6 +465,7 @@ static void printHelp(void) {
 		  _("use <dir> as the top level directory"));
     printHelpLine(  "      --test              ",
 		  _("don't install, but tell if it would work or not"));
+
     puts("");
     puts(         _("    --upgrade <packagefile>"));
     printHelpLine(_("    -U <packagefile>      "),
@@ -497,7 +513,9 @@ static void printHelp(void) {
     printHelpLine(  "      --clean             ",
 		  _("remove build tree when done"));
     printHelpLine(  "      --rmsource          ",
-		  _("remove sources and spec file when done"));
+		  _("remove sources when done"));
+    printHelpLine(  "      --rmspec            ",
+		  _("remove spec file when done"));
     printHelpLine(  "      --sign              ",
 		  _("generate PGP/GPG signature"));
     printHelpLine(_("      --buildroot <dir>   "),
@@ -511,16 +529,16 @@ static void printHelp(void) {
     puts("");
     printHelpLine(_("    --rebuild <src_pkg>   "),
 		  _("install source package, build binary package and remove spec file, sources, patches, and icons."));
-    printHelpLine(_("    --rmsource <spec>     "),
-		  _("remove sources and spec file"));
     printHelpLine(_("    --recompile <src_pkg> "),
 		  _("like --rebuild, but don't build any package"));
+
+    puts("");
     printHelpLine(_("    --resign <pkg>+       "),
 		  _("sign a package (discard current signature)"));
     printHelpLine(_("    --addsign <pkg>+      "),
 		  _("add a signature to a package"));
-    puts(           "    -K");
-    printHelpLine(_("    --checksig <pkg>+     "),
+    puts(         _("    --checksig <pkg>+"));
+    printHelpLine(_("    -K <pkg>+           "),
 		  _("verify package signature"));
     printHelpLine(  "      --nopgp             ",
 		  _("skip any PGP signatures"));
@@ -528,8 +546,8 @@ static void printHelp(void) {
 		  _("skip any GPG signatures"));
     printHelpLine(  "      --nomd5             ",
 		  _("skip any MD5 signatures"));
-    printHelpLine(  "    --querytags           ",
-		  _("list the tags that can be used in a query format"));
+
+    puts("");
     printHelpLine(  "    --initdb              ",
 		  _("make sure a valid database exists"));
     printHelpLine(  "    --rebuilddb           ",
@@ -538,6 +556,15 @@ static void printHelp(void) {
 		  _("use <dir> as the directory for the database"));
     printHelpLine(  "      --root <dir>        ",
 		  _("use <dir> as the top level directory"));
+
+    puts("");
+    printHelpLine(  "    --setperms            ",
+		  _("set the file permissions to those in the package database"
+		    " using the same package specification options as -q"));
+    printHelpLine(  "    --setugids            ",
+		  _("set the file owner and group to those in the package "
+		    "database using the same package specification options as "
+		    "-q"));
 }
 
 int main(int argc, const char ** argv)
@@ -548,12 +575,13 @@ int main(int argc, const char ** argv)
     enum rpmQVSources QVSource = RPMQV_PACKAGE;
     int arg;
     int installFlags = 0, uninstallFlags = 0, interfaceFlags = 0;
-    int gotDbpath = 0, verifyFlags;
+#ifdef	DYING
+    int gotDbpath = 0;
+#endif
+    int verifyFlags;
     int checksigFlags = 0;
-    unsigned long int timeCheck = 0L;
     int addSign = NEW_SIGNATURE;
     const char * specFile;
-    char * tce;
     char * passPhrase = "";
     char * cookie = NULL;
     const char * optArg;
@@ -584,10 +612,12 @@ int main(int argc, const char ** argv)
     excldocs = 0;
     force = 0;
     _ftp_debug = 0;
+#ifdef	DYING
     ftpProxy = NULL;
     ftpPort = NULL;
     httpProxy = NULL;
     httpPort = NULL;
+#endif
     showHash = 0;
     help = 0;
     ignoreArch = 0;
@@ -834,6 +864,7 @@ int main(int argc, const char ** argv)
 	    signIt = 1;
 	    break;
 
+#ifdef	DYING
 	  case GETOPT_DBPATH:
 	    switch (urlIsURL(optArg)) {
 	    case URL_IS_UNKNOWN:
@@ -847,6 +878,7 @@ int main(int argc, const char ** argv)
 	    addMacro(&rpmCLIMacroContext, "_dbpath", NULL, optArg, RMIL_CMDLINE);
 	    gotDbpath = 1;
 	    break;
+#endif	/* DYING */
 
 	  case GETOPT_DEFINEMACRO:
 	    rpmDefineMacro(NULL, optArg, RMIL_CMDLINE);
@@ -861,8 +893,10 @@ int main(int argc, const char ** argv)
 	    noUsageMsg = 1;
 	  } break;
 
+#ifdef	DYING
 	  case GETOPT_TIMECHECK:
-	    tce = NULL;
+	  { char * tce = NULL;
+	    unsigned long int timeCheck = 0L;
 	    timeCheck = strtoul(optArg, &tce, 10);
 	    if ((*tce) || (tce == optArg) || (timeCheck == ULONG_MAX)) {
 		argerror("Argument to --timecheck must be integer");
@@ -870,7 +904,8 @@ int main(int argc, const char ** argv)
 	    addMacro(NULL, "_timecheck", NULL, optArg, RMIL_CMDLINE);
 	    addMacro(&rpmCLIMacroContext, "_timecheck", NULL, optArg, RMIL_CMDLINE);
 	    timeCheck = 1;
-	    break;
+	  } break;
+#endif
 
 	  case GETOPT_REBUILDDB:
 	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_REBUILDDB)
@@ -953,12 +988,14 @@ int main(int argc, const char ** argv)
 	argerror("--buildroot may only be used during package builds");
     }
 
+#ifdef	DYING
     if (gotDbpath && (bigMode & ~MODES_FOR_DBPATH))
 	argerror(_("--dbpath given for operation that does not use a "
 			"database"));
 
-    if (timeCheck && (bigMode & ~MODES_FOR_TIMECHECK))
+    if (timeCheck && (bigMode & ~MODES_BT))
 	argerror(_("--timecheck may only be used during package builds"));
+#endif
     
     if (qva->qva_flags && (bigMode & ~MODES_QV)) 
 	argerror(_("unexpected query flags"));
@@ -1081,6 +1118,7 @@ int main(int argc, const char ** argv)
     if (oldPackage && !upgrade)
 	argerror(_("--oldpackage may only be used during upgrades"));
 
+#ifdef	DYING
     if ((ftpProxy || ftpPort) && !(bigMode == MODE_INSTALL ||
 	((bigMode == MODE_QUERY && QVSource == RPMQV_RPM)) ||
 	((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM))))
@@ -1092,6 +1130,7 @@ int main(int argc, const char ** argv)
 	((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM))))
 	argerror(_("http options can only be used during package queries, "
 		 "installs, and upgrades"));
+#endif	/* DYING */
 
     if (noPgp && bigMode != MODE_CHECKSIG)
 	argerror(_("--nopgp may only be used during signature checking"));
@@ -1103,6 +1142,7 @@ int main(int argc, const char ** argv)
 	argerror(_("--nomd5 may only be used during signature checking and "
 		   "package verification"));
 
+#ifdef	DYING
     if (ftpProxy) {
 	addMacro(NULL, "_ftpproxy", NULL, ftpProxy, RMIL_CMDLINE);
 	addMacro(&rpmCLIMacroContext, "_ftpproxy", NULL, ftpProxy, RMIL_CMDLINE);
@@ -1119,6 +1159,7 @@ int main(int argc, const char ** argv)
 	addMacro(NULL, "_httpport", NULL, httpPort, RMIL_CMDLINE);
 	addMacro(&rpmCLIMacroContext, "_httpport", NULL, httpPort, RMIL_CMDLINE);
     }
+#endif
 
     if (signIt) {
         if (bigMode == MODE_REBUILD || bigMode == MODE_BUILD ||
diff --git a/rpm.spec b/rpm.spec
index a782ae38c..3fe0d1a85 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.1
 Version: %{version}
-Release: 0.21
+Release: 0.22
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -141,6 +141,8 @@ fi
 %dir /etc/rpm
 /usr/bin/rpm2cpio
 /usr/bin/gendiff
+/usr/bin/rpmdb
+/usr/bin/rpm[eiukqv]
 /usr/lib/librpm.so.*
 /usr/lib/librpmbuild.so.*
 
@@ -155,6 +157,9 @@ fi
 /usr/lib/rpm/freshen.sh
 /usr/lib/rpm/macros
 /usr/lib/rpm/mkinstalldirs
+/usr/lib/rpm/rpmdb
+/usr/lib/rpm/rpm[eiukqv]
+/usr/lib/rpm/rpme
 /usr/lib/rpm/rpmpopt
 /usr/lib/rpm/rpmrc
 /usr/lib/rpm/vpkg-provides.sh
@@ -189,6 +194,7 @@ fi
 
 %files build
 %defattr(-,root,root)
+/usr/bin/rpm[bt]
 /usr/lib/rpm/check-prereqs
 /usr/lib/rpm/cpanflute
 /usr/lib/rpm/find-lang.sh
@@ -201,6 +207,7 @@ fi
 /usr/lib/rpm/magic.req
 /usr/lib/rpm/perl.prov
 /usr/lib/rpm/perl.req
+/usr/lib/rpm/rpm[bt]
 /usr/lib/rpm/rpmdiff
 /usr/lib/rpm/rpmdiff.cgi
 /usr/lib/rpm/rpmgettext
@@ -236,6 +243,10 @@ fi
 /usr/include/popt.h
 
 %changelog
+* Wed May 24 2000 Jeff Johnson <jbj@redhat.com>
+- change popt exec alias in oreder to exec rpm children.
+- split rpm into 5 pieces along major mode fault lines with popt glue.
+
 * Thu May 18 2000 Jeff Johnson <jbj@redhat.com>
 - 2nd try at db1 -> db3 stable functionality.
 
diff --git a/rpmpopt.in b/rpmpopt.in
index b60beadce..eaa6379e8 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -91,6 +91,100 @@ rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
 #
 # There are two macros so that --rebuilddb can convert db1 -> db3
 rpm alias --dbapi		 --define '_dbapi !#:+'
-rpm alias --rebuilddbapi	 --define '_dbapi_rebuild !#:+'
 
+rpm alias --rebuilddbapi	 --define '_dbapi_rebuild !#:+'
 rpm alias --rebuilddbpath	 --define '_dbapath_rebuild !#:+'
+
+#==============================================================================
+#	[--dbpath <dir>]	"use <dir> as the directory for the database"
+rpm	alias --dbpath		--define '_dbpath !#:+'
+#	[--ftpport <port>]	"port number of ftp server (or proxy)"
+rpm	alias --ftpport		--define '_ftpport !#:+'
+#	[--ftpproxy <host>]	"hostname or IP of ftp proxy"
+rpm	alias --ftpproxy	--define '_ftpproxy !#:+'
+#	[--httpport <port>]	"port number of http server (or proxy)"
+rpm	alias --httpport	--define '_httpport !#:+'
+#	[--httpproxy <host>]	"hostname or IP of http proxy"
+rpm	alias --httpproxy	--define '_httpproxy !#:+'
+
+# set the time check to <secs>
+rpm	alias --timecheck	--define '_timecheck !#:+'
+
+#==============================================================================
+rpm	exec -b			rpmb -b
+rpm	exec --build		rpmb --build
+rpm	exec --rebuild		rpmb --rebuild
+rpm	exec --recompile	rpmb --recompile
+rpm	exec -t			rpmt -t
+rpm	exec --tarbuild		rpmt --tarbuild
+
+rpm	exec --initdb		rpmdb --initdb
+rpm	exec --rebuilddb	rpmdb --rebuilddb
+
+#rpm	exec -e			rpme -e
+#rpm	exec --erase		rpme --erase
+#rpm	exec -U			rpmu -U
+#rpm	exec --upgrade		rpmu --upgrade
+
+rpm	exec --addsign		rpmk --addsign
+rpm	exec -K			rpmk -K
+rpm	exec --checksig		rpmk --checksig
+rpm	exec --resign		rpmk --resign
+
+rpm	exec -q			rpmq -q
+rpm	exec --query		rpmq --query
+rpm	exec --querytags	rpmq --querytags
+rpm	exec -V			rpmv -V
+rpm	exec -y			rpmv -y
+rpm	exec --verify		rpmv --verify
+
+#==============================================================================
+rpmb	alias --dbpath		--define '_dbpath !#:+'
+rpmb	alias --ftpport		--define '_ftpport !#:+'
+rpmb	alias --ftpproxy	--define '_ftpproxy !#:+'
+rpmb	alias --httpport	--define '_httpport !#:+'
+rpmb	alias --httpproxy	--define '_httpproxy !#:+'
+rpmb	alias --timecheck	--define '_timecheck !#:+'
+#==============================================================================
+rpmdb	alias --dbpath		--define '_dbpath !#:+'
+rpmdb	alias --ftpport		--define '_ftpport !#:+'
+rpmdb	alias --ftpproxy	--define '_ftpproxy !#:+'
+rpmdb	alias --httpport	--define '_httpport !#:+'
+rpmdb	alias --httpproxy	--define '_httpproxy !#:+'
+#==============================================================================
+rpme	alias --dbpath		--define '_dbpath !#:+'
+rpme	alias --ftpport		--define '_ftpport !#:+'
+rpme	alias --ftpproxy	--define '_ftpproxy !#:+'
+rpme	alias --httpport	--define '_httpport !#:+'
+rpme	alias --httpproxy	--define '_httpproxy !#:+'
+#==============================================================================
+rpmi	alias --dbpath		--define '_dbpath !#:+'
+rpmi	alias --ftpport		--define '_ftpport !#:+'
+rpmi	alias --ftpproxy	--define '_ftpproxy !#:+'
+rpmi	alias --httpport	--define '_httpport !#:+'
+rpmi	alias --httpproxy	--define '_httpproxy !#:+'
+#==============================================================================
+rpmq	alias --dbpath		--define '_dbpath !#:+'
+rpmq	alias --ftpport		--define '_ftpport !#:+'
+rpmq	alias --ftpproxy	--define '_ftpproxy !#:+'
+rpmq	alias --httpport	--define '_httpport !#:+'
+rpmq	alias --httpproxy	--define '_httpproxy !#:+'
+#==============================================================================
+rpmt	alias --dbpath		--define '_dbpath !#:+'
+rpmt	alias --ftpport		--define '_ftpport !#:+'
+rpmt	alias --ftpproxy	--define '_ftpproxy !#:+'
+rpmt	alias --httpport	--define '_httpport !#:+'
+rpmt	alias --httpproxy	--define '_httpproxy !#:+'
+rpmt	alias --timecheck	--define '_timecheck !#:+'
+#==============================================================================
+rpmu	alias --dbpath		--define '_dbpath !#:+'
+rpmu	alias --ftpport		--define '_ftpport !#:+'
+rpmu	alias --ftpproxy	--define '_ftpproxy !#:+'
+rpmu	alias --httpport	--define '_httpport !#:+'
+rpmu	alias --httpproxy	--define '_httpproxy !#:+'
+#==============================================================================
+rpmv	alias --dbpath		--define '_dbpath !#:+'
+rpmv	alias --ftpport		--define '_ftpport !#:+'
+rpmv	alias --ftpproxy	--define '_ftpproxy !#:+'
+rpmv	alias --httpport	--define '_httpport !#:+'
+rpmv	alias --httpproxy	--define '_httpproxy !#:+'
diff --git a/rpmqv.c b/rpmqv.c
index 291903c4b..792f47fd7 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -1,193 +1,275 @@
 #include "system.h"
 
+#if 0
+#define	IAM_RPMBT
+#undef	IAM_RPMDB
+#undef	IAM_RPMEIU
+#undef	IAM_RPMQV
+#undef	IAM_RPMK
+#endif
+
 #include <rpmbuild.h>
 #include <rpmurl.h>
 
+#ifdef	IAM_RPMBT
 #include "build.h"
-#include "install.h"
-#include "signature.h"
-
 #define GETOPT_REBUILD		1003
 #define GETOPT_RECOMPILE	1004
-#define GETOPT_ADDSIGN		1005
-#define GETOPT_RESIGN		1006
-#define GETOPT_DBPATH		1010
-#define GETOPT_TIMECHECK        1012
+static struct rpmBuildArguments rpmBArgs;
+#endif
+
+#ifdef	IAM_RPMDB
 #define GETOPT_REBUILDDB        1013
+static int initdb = 0;
+#endif
+
+#ifdef	IAM_RPMEIU
+#include "install.h"
 #define GETOPT_INSTALL		1014
 #define GETOPT_RELOCATE		1016
-#define GETOPT_SHOWRC		1018
 #define GETOPT_EXCLUDEPATH	1019
+static int allFiles = 0;
+static int allMatches = 0;
+static int badReloc = 0;
+static int excldocs = 0;
+static int ignoreArch = 0;
+static int ignoreOs = 0;
+static int ignoreSize = 0;
+static int incldocs = 0;
+static int justdb = 0;
+static int noOrder = 0;
+static int oldPackage = 0;
+static char * prefix = NULL;
+static int replaceFiles = 0;
+static int replacePackages = 0;
+static int showHash = 0;
+static int showPercents = 0;
+static int noTriggers = 0;
+#endif	/* IAM_RPMEIU */
+
+#ifdef	IAM_RPMK
+#define GETOPT_ADDSIGN		1005
+#define GETOPT_RESIGN		1006
+static int noGpg = 0;
+static int noPgp = 0;
+#endif	/* IAM_RPMK */
+
+#ifdef	IAM_RPMQV
+static struct rpmQVArguments rpmQVArgs;
+static int queryTags = 0;
+#endif
+
+#if defined(IAM_RPMBT) || defined(IAM_RPMK)
+#include "signature.h"
+#endif
+
+#define GETOPT_DBPATH		1010
+#define GETOPT_SHOWRC		1018
 #define	GETOPT_DEFINEMACRO	1020
 #define	GETOPT_EVALMACRO	1021
 
 enum modes {
-    MODE_UNKNOWN	= 0,
+
     MODE_QUERY		= (1 <<  0),
+    MODE_VERIFY		= (1 <<  3),
+    MODE_QUERYTAGS	= (1 <<  9),
+#define	MODES_QV (MODE_QUERY | MODE_VERIFY)
+
     MODE_INSTALL	= (1 <<  1),
     MODE_UNINSTALL	= (1 <<  2),
-    MODE_VERIFY		= (1 <<  3),
+#define	MODES_IE (MODE_INSTALL | MODE_UNINSTALL)
+
     MODE_BUILD		= (1 <<  4),
     MODE_REBUILD	= (1 <<  5),
-    MODE_CHECKSIG	= (1 <<  6),
-    MODE_RESIGN		= (1 <<  7),
     MODE_RECOMPILE	= (1 <<  8),
-    MODE_QUERYTAGS	= (1 <<  9),
-    MODE_INITDB		= (1 << 10),
     MODE_TARBUILD	= (1 << 11),
-    MODE_REBUILDDB	= (1 << 12)
-};
-
-#define	MODES_QV (MODE_QUERY | MODE_VERIFY)
 #define	MODES_BT (MODE_BUILD | MODE_TARBUILD | MODE_REBUILD | MODE_RECOMPILE)
-#define	MODES_IE (MODE_INSTALL | MODE_UNINSTALL)
-#define	MODES_DB (MODE_INITDB | MODE_REBUILDDB)
+
+    MODE_CHECKSIG	= (1 <<  6),
+    MODE_RESIGN		= (1 <<  7),
 #define	MODES_K	 (MODE_CHECKSIG | MODES_RESIGN)
 
+    MODE_INITDB		= (1 << 10),
+    MODE_REBUILDDB	= (1 << 12),
+#define	MODES_DB (MODE_INITDB | MODE_REBUILDDB)
+
+    MODE_UNKNOWN	= 0
+};
+
 #define	MODES_FOR_DBPATH	(MODES_BT | MODES_IE | MODES_QV | MODES_DB)
-#define	MODES_FOR_TIMECHECK	(MODES_BT)
 #define	MODES_FOR_NODEPS	(MODES_BT | MODES_IE | MODE_VERIFY)
 #define	MODES_FOR_TEST		(MODES_BT | MODES_IE)
 #define	MODES_FOR_ROOT		(MODES_BT | MODES_IE | MODES_QV | MODES_DB)
 
-/* the flags for the various options */
-static int allFiles;
-static int allMatches;
-static int badReloc;
-static int excldocs;
-static int force;
 extern int _ftp_debug;
-static char * ftpPort;
-static char * ftpProxy;
-static char * httpPort;
-static char * httpProxy;
-static int showHash;
-static int help;
-static int ignoreArch;
-static int ignoreOs;
-static int ignoreSize;
-static int incldocs;
-static int initdb;
-static int justdb;
-static int noDeps;
-static int noGpg;
 extern int noLibio;
-static int noMd5;
-static int noOrder;
-static int noPgp;
-static int noScripts;
-static int noTriggers;
-static int noUsageMsg;
-static int oldPackage;
-static char * pipeOutput;
-static char * prefix;
-static int queryTags;
-static int quiet;
-static char * rcfile;
-static int replaceFiles;
-static int replacePackages;
-static char * rootdir;
 extern int _rpmio_debug;
-static int showPercents;
-static int showrc;
-static int signIt;
-static int test;
 extern int _url_debug;
 extern int _noDirTokens;
-extern int _useDbiMajor;
 
-static int showVersion;
 extern const char * rpmNAME;
 extern const char * rpmEVR;
 extern int rpmFLAGS;
 
 extern MacroContext rpmCLIMacroContext;
 
-static struct rpmQVArguments rpmQVArgs;
-static struct rpmBuildArguments rpmBArgs;
+/* options for all executables */
+#ifdef	DYING
+static char * ftpPort = NULL;
+static char * ftpProxy = NULL;
+static char * httpPort = NULL;
+static char * httpProxy = NULL;
+#endif
+
+static int help = 0;
+static int noUsageMsg = 0;
+static char * pipeOutput = NULL;
+static int quiet = 0;
+static char * rcfile = NULL;
+static char * rootdir = "/";
+static int showrc = 0;
+static int showVersion = 0;
+
+#if defined(IAM_RPMBT) || defined(IAM_RPMK)
+static int signIt = 0;
+#endif	/* IAM_RPMBT || IAM_RPMK */
+
+#if defined(IAM_RPMQV) || defined(IAM_RPMK)
+static int noMd5 = 0;
+#endif
+
+#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+static int noDeps = 0;
+#endif
+
+#if defined(IAM_RPMQV) || defined(IAM_RPMEIU)
+static int noScripts = 0;
+#endif
+
+#if defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+static int force = 0;
+static int test = 0;
+#endif
 
 /* the structure describing the options we take and the defaults */
 static struct poptOption optionsTable[] = {
- { "addsign", '\0', 0, 0, GETOPT_ADDSIGN,	NULL, NULL},
-/* all and allmatches both using 'a' is dumb */
- { "all", 'a', 0, 0, 'a',			NULL, NULL},
- { "allfiles", '\0', 0, &allFiles, 0,		NULL, NULL},
- { "allmatches", '\0', 0, &allMatches, 0,	NULL, NULL},
- { "badreloc", '\0', 0, &badReloc, 0,		NULL, NULL},
- { "build", 'b', POPT_ARG_STRING, 0, 'b',	NULL, NULL},
- { "checksig", 'K', 0, 0, 'K',			NULL, NULL},
- { "dbpath", '\0', POPT_ARG_STRING, 0, GETOPT_DBPATH,		NULL, NULL},
+ { "help", '\0', 0, &help, 0,			NULL, NULL},
+ { "version", '\0', 0, &showVersion, 0,		NULL, NULL},
+
+ { "quiet", '\0', 0, &quiet, 0,			NULL, NULL},
+ { "verbose", 'v', 0, 0, 'v',			NULL, NULL},
+
  { "define", '\0', POPT_ARG_STRING, 0, GETOPT_DEFINEMACRO,NULL, NULL},
- { "dirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 0,	NULL, NULL},
- { "erase", 'e', 0, 0, 'e',			NULL, NULL},
  { "eval", '\0', POPT_ARG_STRING, 0, GETOPT_EVALMACRO, NULL, NULL},
- { "excludedocs", '\0', 0, &excldocs, 0,	NULL, NULL},
- { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH,	NULL, NULL},
- { "force", '\0', 0, &force, 0,			NULL, NULL},
+
+ { "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1,	NULL, NULL},
+ { "dirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 0,	NULL, NULL},
+#if HAVE_LIBIO_H && defined(_IO_BAD_SEEN)
+ { "nolibio", '\0', POPT_ARG_VAL, &noLibio, 1,		NULL, NULL},
+#endif
  { "ftpdebug", '\0', POPT_ARG_VAL, &_ftp_debug, -1,		NULL, NULL},
+ { "rpmiodebug", '\0', POPT_ARG_VAL, &_rpmio_debug, -1,		NULL, NULL},
+ { "urldebug", '\0', POPT_ARG_VAL, &_url_debug, -1,		NULL, NULL},
+
+#if defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+ { "force", '\0', 0, &force, 0,			NULL, NULL},
+ { "test", '\0', 0, &test, 0,			NULL, NULL},
+#endif
+
+ { "all", 'a', 0, 0, 'a',			NULL, NULL},
+
+#ifdef	DYING
+ { "dbpath", '\0', POPT_ARG_STRING, 0, GETOPT_DBPATH,		NULL, NULL},
  { "ftpport", '\0', POPT_ARG_STRING, &ftpPort, 0,	NULL, NULL},
  { "ftpproxy", '\0', POPT_ARG_STRING, &ftpProxy, 0,	NULL, NULL},
- { "hash", 'h', 0, &showHash, 0,		NULL, NULL},
- { "help", '\0', 0, &help, 0,			NULL, NULL},
  { "httpport", '\0', POPT_ARG_STRING, &httpPort, 0,	NULL, NULL},
  { "httpproxy", '\0', POPT_ARG_STRING, &httpProxy, 0,	NULL, NULL},
+#endif	/* DYING */
  {  NULL, 'i', 0, 0, 'i',			NULL, NULL},
+ { "pipe", '\0', POPT_ARG_STRING, &pipeOutput, 0,	NULL, NULL},
+ { "root", 'r', POPT_ARG_STRING, &rootdir, 0,	NULL, NULL},
+
+ { "rcfile", '\0', POPT_ARG_STRING, &rcfile, 0,	NULL, NULL},
+ { "showrc", '\0', 0, &showrc, GETOPT_SHOWRC,	NULL, NULL},
+
+#if defined(IAM_RPMQV) || defined(IAM_RPMK)
+ { "nomd5", '\0', 0, &noMd5, 0,			NULL, NULL},
+#endif
+
+#if defined(IAM_RPMQV) || defined(IAM_RPMEIU)
+ { "nodeps", '\0', 0, &noDeps, 0,		NULL, NULL},
+ { "noscripts", '\0', 0, &noScripts, 0,		NULL, NULL},
+#endif
+
+#ifdef	IAM_RPMK
+ { "addsign", '\0', 0, 0, GETOPT_ADDSIGN,	NULL, NULL},
+ { "checksig", 'K', 0, 0, 'K',			NULL, NULL},
+ { "nogpg", '\0', 0, &noGpg, 0,			NULL, NULL},
+ { "nopgp", '\0', 0, &noPgp, 0,			NULL, NULL},
+ { "resign", '\0', 0, 0, GETOPT_RESIGN,		NULL, NULL},
+#endif
+
+#if defined(IAM_RPMBT) || defined(IAM_RPMK)
+ { "sign", '\0', 0, &signIt, 0,			NULL, NULL},
+#endif	/* IAM_RPMBT || IAM_RPMK */
+
+#ifdef	IAM_RPMBT
+ { "build", 'b', POPT_ARG_STRING, 0, 'b',	NULL, NULL},
+ { "rebuild", '\0', 0, 0, GETOPT_REBUILD,	NULL, NULL},
+ { "recompile", '\0', 0, 0, GETOPT_RECOMPILE,	NULL, NULL},
+ { "tarbuild", 't', POPT_ARG_STRING, 0, 't',	NULL, NULL},
+#endif	/* IAM_RPMBT */
+
+#ifdef	IAM_RPMDB
+ { "initdb", '\0', 0, &initdb, 0,		NULL, NULL},
+ { "rebuilddb", '\0', 0, 0, GETOPT_REBUILDDB,	NULL, NULL},
+#endif	/* IAM_RPMDB */
+
+#ifdef	IAM_RPMEIU
+ { "allfiles", '\0', 0, &allFiles, 0,		NULL, NULL},
+ { "allmatches", '\0', 0, &allMatches, 0,	NULL, NULL},
+ { "badreloc", '\0', 0, &badReloc, 0,		NULL, NULL},
+ { "erase", 'e', 0, 0, 'e',			NULL, NULL},
+ { "excludedocs", '\0', 0, &excldocs, 0,	NULL, NULL},
+ { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH,	NULL, NULL},
+ { "hash", 'h', 0, &showHash, 0,		NULL, NULL},
  { "ignorearch", '\0', 0, &ignoreArch, 0,	NULL, NULL},
  { "ignoreos", '\0', 0, &ignoreOs, 0,		NULL, NULL},
  { "ignoresize", '\0', 0, &ignoreSize, 0,	NULL, NULL},
  { "includedocs", '\0', 0, &incldocs, 0,	NULL, NULL},
- { "initdb", '\0', 0, &initdb, 0,		NULL, NULL},
 /* info and install both using 'i' is dumb */
  { "install", '\0', 0, 0, GETOPT_INSTALL,	NULL, NULL},
  { "justdb", '\0', 0, &justdb, 0,		NULL, NULL},
- { "nodeps", '\0', 0, &noDeps, 0,		NULL, NULL},
- { "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1,	NULL, NULL},
- { "nogpg", '\0', 0, &noGpg, 0,			NULL, NULL},
-#if HAVE_LIBIO_H && defined(_IO_BAD_SEEN)
- { "nolibio", '\0', POPT_ARG_VAL, &noLibio, 1,		NULL, NULL},
-#endif
- { "nomd5", '\0', 0, &noMd5, 0,			NULL, NULL},
  { "noorder", '\0', 0, &noOrder, 0,		NULL, NULL},
- { "nopgp", '\0', 0, &noPgp, 0,			NULL, NULL},
- { "noscripts", '\0', 0, &noScripts, 0,		NULL, NULL},
  { "notriggers", '\0', 0, &noTriggers, 0,	NULL, NULL},
  { "oldpackage", '\0', 0, &oldPackage, 0,	NULL, NULL},
  { "percent", '\0', 0, &showPercents, 0,	NULL, NULL},
- { "pipe", '\0', POPT_ARG_STRING, &pipeOutput, 0,	NULL, NULL},
  { "prefix", '\0', POPT_ARG_STRING, &prefix, 0,	NULL, NULL},
- { "query", 'q', 0, NULL, 'q',			NULL, NULL},
- { "querytags", '\0', 0, &queryTags, 0,		NULL, NULL},
- { "quiet", '\0', 0, &quiet, 0,			NULL, NULL},
- { "rcfile", '\0', POPT_ARG_STRING, &rcfile, 0,	NULL, NULL},
- { "rebuild", '\0', 0, 0, GETOPT_REBUILD,	NULL, NULL},
- { "rebuilddb", '\0', 0, 0, GETOPT_REBUILDDB,	NULL, NULL},
- { "recompile", '\0', 0, 0, GETOPT_RECOMPILE,	NULL, NULL},
  { "relocate", '\0', POPT_ARG_STRING, 0, GETOPT_RELOCATE,	NULL, NULL},
  { "replacefiles", '\0', 0, &replaceFiles, 0,	NULL, NULL},
  { "replacepkgs", '\0', 0, &replacePackages, 0,	NULL, NULL},
- { "resign", '\0', 0, 0, GETOPT_RESIGN,		NULL, NULL},
- { "root", 'r', POPT_ARG_STRING, &rootdir, 0,	NULL, NULL},
- { "rpmiodebug", '\0', POPT_ARG_VAL, &_rpmio_debug, -1,		NULL, NULL},
- { "showrc", '\0', 0, &showrc, GETOPT_SHOWRC,	NULL, NULL},
- { "sign", '\0', 0, &signIt, 0,			NULL, NULL},
- { "tarbuild", 't', POPT_ARG_STRING, 0, 't',	NULL, NULL},
- { "test", '\0', 0, &test, 0,			NULL, NULL},
- { "timecheck", '\0', POPT_ARG_STRING, 0, GETOPT_TIMECHECK,	NULL, NULL},
  { "upgrade", 'U', 0, 0, 'U',			NULL, NULL},
- { "urldebug", '\0', POPT_ARG_VAL, &_url_debug, -1,		NULL, NULL},
  { "uninstall", 'u', 0, 0, 'u',			NULL, NULL},
- { "verbose", 'v', 0, 0, 'v',			NULL, NULL},
+#endif	/* IAM_RPMEIU */
+
+#ifdef	IAM_RPMQV
+ { "query", 'q', 0, NULL, 'q',			NULL, NULL},
  { "verify", 'V', 0, 0, 'V',			NULL, NULL},
  {  NULL, 'y', 0, 0, 'V',			NULL, NULL},
- { "version", '\0', 0, &showVersion, 0,		NULL, NULL},
+ { "querytags", '\0', 0, &queryTags, 0,		NULL, NULL},
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, 
 		rpmQVSourcePoptTable, 0,	(void *) &rpmQVArgs, NULL },
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, 
 		rpmQueryPoptTable, 0,		(void *) &rpmQVArgs, NULL },
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, 
 		rpmVerifyPoptTable, 0,		(void *) &rpmQVArgs, NULL },
+#endif	/* IAM_RPMQV */
+
+#ifdef	IAM_RPMBT
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, 
 		rpmBuildPoptTable, 0,		(void *) &rpmBArgs, NULL },
+#endif	/* IAM_RPMBT */
+
  { 0, 0, 0, 0, 0,	NULL, NULL }
 };
 
@@ -196,7 +278,7 @@ static struct poptOption optionsTable[] = {
 long _stksize = 64 * 1024L;
 #endif
 
-static void argerror(char * desc) {
+static void argerror(const char * desc) {
     fprintf(stderr, _("rpm: %s\n"), desc);
     exit(EXIT_FAILURE);
 }
@@ -217,14 +299,23 @@ static void printBanner(void) {
 }
 
 static void printUsage(void) {
+    FILE * fp;
     printVersion();
     printBanner();
     puts("");
 
-    puts(_("usage: rpm {--help}"));
-    puts(_("       rpm {--version}"));
-    puts(_("       rpm {--initdb}   [--dbpath <dir>]"));
-    puts(_("       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"));
+    fp = stdout;
+
+    fprintf(fp, _("Usage: %s {--help}\n"), __progname);
+    fprintf(fp, _("       %s {--version}\n"), __progname);
+
+#ifdef	IAM_RPMDB
+    fprintf(fp, _("       %s {--initdb}   [--dbpath <dir>]\n"), __progname);
+    fprintf(fp, _("       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"), __progname);
+#endif
+
+#ifdef	IAM_RPMEIU
+    fprintf(fp, _("       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"), __progname);
     puts(_("                        [--replacepkgs] [--replacefiles] [--root <dir>]"));
     puts(_("                        [--excludedocs] [--includedocs] [--noscripts]"));
     puts(_("                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"));
@@ -234,7 +325,7 @@ static void printUsage(void) {
     puts(_("                        [--noorder] [--relocate oldpath=newpath]"));
     puts(_("                        [--badreloc] [--notriggers] [--excludepath <path>]"));
     puts(_("                        [--ignoresize] file1.rpm ... fileN.rpm"));
-    puts(_("       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"));
+    fprintf(fp, _("       %s {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]\n"), __progname);
     puts(_("                        [--oldpackage] [--root <dir>] [--noscripts]"));
     puts(_("                        [--excludedocs] [--includedocs] [--rcfile <file>]"));
     puts(_("                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "));
@@ -244,35 +335,45 @@ static void printUsage(void) {
     puts(_("                        [--noorder] [--relocate oldpath=newpath]"));
     puts(_("                        [--badreloc] [--excludepath <path>] [--ignoresize]"));
     puts(_("                        file1.rpm ... fileN.rpm"));
-    puts(_("       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"));
+    fprintf(fp, _("       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"), __progname);
+    puts(_("                        [--dbpath <dir>] [--nodeps] [--allmatches]"));
+    puts(_("                        [--justdb] [--notriggers] rpackage1 ... packageN"));
+#endif	/* IAM_RPMEIU */
+
+#ifdef	IAM_RPMQV
+    fprintf(fp, _("       %s {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]\n"), __progname);
     puts(_("                        [--scripts] [--root <dir>] [--rcfile <file>]"));
     puts(_("                        [--whatprovides] [--whatrequires] [--requires]"));
     puts(_("                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"));
     puts(_("                        [--httpproxy <host>] [--httpport <port>] "));
     puts(_("                        [--ftpport <port>] [--provides] [--triggers] [--dump]"));
     puts(_("                        [--changelog] [--dbpath <dir>] [targets]"));
-    puts(_("       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"));
+    fprintf(fp, _("       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"), __progname);
     puts(_("                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"));
     puts(_("                        [--nomd5] [targets]"));
-    puts(_("       rpm {--setperms} [-afpg] [target]"));
-    puts(_("       rpm {--setugids} [-afpg] [target]"));
-    puts(_("       rpm {--freshen -F} file1.rpm ... fileN.rpm"));
-    puts(_("       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"));
-    puts(_("                        [--dbpath <dir>] [--nodeps] [--allmatches]"));
-    puts(_("                        [--justdb] [--notriggers] rpackage1 ... packageN"));
-    puts(_("       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"));
-    puts(_("                        [--sign] [--nobuild] [--timecheck <s>] ]"));
+    fprintf(fp, _("       %s {--querytags}\n"), __progname);
+    fprintf(fp, _("       %s {--setperms} [-afpg] [target]\n"), __progname);
+    fprintf(fp, _("       %s {--setugids} [-afpg] [target]\n"), __progname);
+#endif	/* IAM_RPMQV */
+
+#ifdef	IAM_RPMBT
+    fprintf(fp, _("       %s {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]\n"), __progname);
+    puts(_("                        [--sign] [--nobuild] ]"));
     puts(_("                        [--target=platform1[,platform2...]]"));
     puts(_("                        [--rmsource] [--rmspec] specfile"));
-    puts(_("       rpm {--rmsource} [--rcfile <file>] [-v] specfile"));
-    puts(_("       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"));
-    puts(_("       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"));
-    puts(_("       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"));
-    puts(_("       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"));
-    puts(_("       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"));
+    fprintf(fp, _("       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"), __progname);
+    fprintf(fp, _("       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"), __progname);
+    fprintf(fp, _("       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"), __progname);
+    fprintf(fp, _("       %s {--freshen -F} file1.rpm ... fileN.rpm\n"), __progname);
+#endif	/* IAM_RPMBT */
+
+#ifdef	IAM_RPMK
+    fprintf(fp, _("       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"), __progname);
+    fprintf(fp, _("       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"), __progname);
+    fprintf(fp, _("       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"), __progname);
     puts(_("                           package1 ... packageN"));
-    puts(_("       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"));
-    puts(_("       rpm {--querytags}"));
+#endif	/* IAM_RPMK */
+
 }
 
 static void printHelpLine(char * prefix, char * help) {
@@ -306,327 +407,337 @@ static void printHelp(void) {
     printBanner();
     puts("");
 
-    puts(         _("usage:"));
+    puts(         _("Usage:"));
     printHelpLine(  "   --help                 ", 
 		  _("print this message"));
     printHelpLine(  "   --version              ",
 		  _("print the version of rpm being used"));
-    puts(         _("   all modes support the following arguments:"));
-    printHelpLine(_("      --rcfile <file>     "),
+
+    puts("");
+    puts(         _("  All modes support the following options:"));
+    printHelpLine(_("   --define '<name> <body>'"),
+		  _("define macro <name> with value <body>"));
+    printHelpLine(_("   --eval '<name>+'       "),
+		  _("print the expansion of macro <name> to stdout"));
+    printHelpLine(_("   --pipe <cmd>           "),
+		  _("send stdout to <cmd>"));
+    printHelpLine(_("   --rcfile <file>        "),
 		  _("use <file> instead of /etc/rpmrc and $HOME/.rpmrc"));
-    printHelpLine(  "     -v                   ",
+    printHelpLine(  "   --showrc               ",
+		  _("display final rpmrc and macro configuration"));
+#if defined(IAM_RPMBT) || defined(IAM_RPMDB) || defined(IAM_RPMEIU) || defined(IAM_RPMQV)
+    printHelpLine(_("   --dbpath <dir>         "),
+		  _("use <dir> as the directory for the database"));
+    printHelpLine(_("   --root <dir>           "),
+		  _("use <dir> as the top level directory"));
+#endif	/* IAM_RPMBT || IAM_RPMDB || IAM_RPMEIU || IAM_RPMQV */
+    printHelpLine(  "   -v                     ",
 		  _("be a little more verbose"));
-    printHelpLine(  "     -vv                  ",
+    printHelpLine(  "   -vv                    ",
 		  _("be incredibly verbose (for debugging)"));
-    printHelpLine(  "   -q                     ",
-		  _("query mode"));
-    printHelpLine(_("      --root <dir>        "),
-		  _("use <dir> as the top level directory"));
-    printHelpLine(_("      --dbpath <dir>      "),
-		  _("use <dir> as the directory for the database"));
-    printHelpLine(_("      --queryformat <qfmt>"),
-		  _("use <qfmt> as the header format (implies -i)"));
-    puts(         _("   install, upgrade and query (with -p) allow ftp URL's to be used in place"));
-    puts(         _("   of file names as well as the following options:"));
-    printHelpLine(_("      --ftpproxy <host>   "),
+
+#if defined(IAM_RPMEIU) || defined(IAM_RPMQV)
+    puts("");
+    puts(         _("  Install, upgrade and query (with -p) modes allow URL's to be used in place"));
+    puts(         _("  of file names as well as the following options:"));
+    printHelpLine(_("     --ftpproxy <host>    "),
 		  _("hostname or IP of ftp proxy"));
-    printHelpLine(_("      --ftpport <port>    "),
+    printHelpLine(_("     --ftpport <port>     "),
 		  _("port number of ftp server (or proxy)"));
-    printHelpLine(_("      --httpproxy <host>   "),
+    printHelpLine(_("     --httpproxy <host>   "),
 		  _("hostname or IP of http proxy"));
-    printHelpLine(_("      --httpport <port>    "),
+    printHelpLine(_("     --httpport <port>    "),
 		  _("port number of http server (or proxy)"));
-    puts(         _("      Package specification options:"));
-    printHelpLine(  "        -a                ",
-		  _("query all packages"));
-    printHelpLine(_("        -f <file>+        "),
-		  _("query package owning <file>"));
-    printHelpLine(_("        -p <packagefile>+ "),
-		  _("query (uninstalled) package <packagefile>"));
-    printHelpLine(_("        --triggeredby <pkg>"),
-		  _("query packages triggered by <pkg>"));
-    printHelpLine(_("        --whatprovides <cap>"),
-		  _("query packages which provide <cap> capability"));
-    printHelpLine(_("        --whatrequires <cap>"),
-		  _("query packages which require <cap> capability"));
-    puts(         _("      Information selection options:"));
-    printHelpLine(  "        -i                ",
+#endif	/* IAM_RPMEIU || IAM_RPMQV */
+
+#ifdef IAM_RPMQV
+    puts("");
+    puts(         _("  Package specification options:"));
+    printHelpLine(  "     -a, --all           ",
+		  _("query/verify all packages"));
+    printHelpLine(_("     -f <file>+          "),
+		  _("query/verify package owning <file>"));
+    printHelpLine(_("     -p <packagefile>+   "),
+		  _("query/verify (uninstalled) package <packagefile>"));
+    printHelpLine(_("     --triggeredby <pkg> "),
+		  _("query/verify packages triggered by <pkg>"));
+    printHelpLine(_("     --whatprovides <cap> "),
+		  _("query/verify packages which provide <cap> capability"));
+    printHelpLine(_("     --whatrequires <cap> "),
+		  _("query/verify packages which require <cap> capability"));
+    puts("");
+    printHelpLine(  "  -q, --query             ",
+		  _("query mode"));
+    printHelpLine(_("     --queryformat <qfmt> "),
+		  _("use <qfmt> as the header format (implies --info)"));
+    puts("");
+    puts(         _("    Information selection options:"));
+    printHelpLine(  "       -i, --info         ",
 		  _("display package information"));
-    printHelpLine(  "        --changelog       ",
+    printHelpLine(  "       --changelog        ",
 		  _("display the package's change log"));
-    printHelpLine(  "        -l                ",
+    printHelpLine(  "       -l                 ",
 		  _("display package file list"));
-    printHelpLine(  "        -s                ",
+    printHelpLine(  "       -s                 ",
 		  _("show file states (implies -l)"));
-    printHelpLine(  "        -d                ",
+    printHelpLine(  "       -d                 ",
 		  _("list only documentation files (implies -l)"));
-    printHelpLine(  "        -c                ",
+    printHelpLine(  "       -c                 ",
 		  _("list only configuration files (implies -l)"));
-    printHelpLine(  "        --dump            ",
+    printHelpLine(  "       --dump             ",
 		  _("show all verifiable information for each file (must be used with -l, -c, or -d)"));
-    printHelpLine(  "        --provides        ",
-		  _("list capabilities package provides"));
-    puts(         _("        --requires"));
-    printHelpLine(  "        -R                ",
-		  _("list package dependencies"));
-    printHelpLine(  "        --scripts         ",
-		  _("print the various [un]install scripts"));
-    printHelpLine("          --triggers        ",
-		  _("show the trigger scripts contained in the package"));
+    printHelpLine(  "       --provides         ",
+		  _("list capabilities provided by package"));
+    printHelpLine(  "       -R, --requires     ",
+		  _("list capabilities required by package"));
+    printHelpLine(  "       --scripts          ",
+		  _("print the various [un]install scriptlets"));
+    printHelpLine(  "       --triggers         ",
+		  _("show the trigger scriptlets contained in the package"));
     puts("");
-    puts(           "    -V");
-    puts(           "    -y");
-    printHelpLine(_("    --pipe <cmd>          "),
-		  _("send stdout to <cmd>"));
-    printHelpLine(  "    --verify              ",
+    printHelpLine(  "   -V, -y, --verify       ",
 		  _("verify a package installation using the same same package specification options as -q"));
-    printHelpLine(_("      --dbpath <dir>      "),
-		  _("use <dir> as the directory for the database"));
-    printHelpLine(_("      --root <dir>        "),
-		  _("use <dir> as the top level directory"));
-    printHelpLine(  "      --nodeps            ",
+    printHelpLine(  "     --nodeps             ",
 		  _("do not verify package dependencies"));
-    printHelpLine(  "      --nomd5             ",
+    printHelpLine(  "     --nomd5              ",
 		  _("do not verify file md5 checksums"));
-    printHelpLine(  "      --nofiles           ",
+    printHelpLine(  "     --nofiles            ",
 		  _("do not verify file attributes"));
     puts("");
-    printHelpLine(  "    --setperms            ",
+    printHelpLine(  "   --querytags            ",
+		  _("list the tags that can be used in a query format"));
+    printHelpLine(  "   --setperms             ",
 		  _("set the file permissions to those in the package database"
 		    " using the same package specification options as -q"));
-    printHelpLine(  "    --setugids            ",
+    printHelpLine(  "   --setugids             ",
 		  _("set the file owner and group to those in the package "
 		    "database using the same package specification options as "
 		    "-q"));
+#endif	/* IAM_RPMQV */
+
+#ifdef	IAM_RPMEIU
     puts("");
-    puts(         _("    --install <packagefile>"));
-    printHelpLine(_("    -i <packagefile>      "),
+    puts(         _("   --install <packagefile>"));
+    printHelpLine(_("   -i <packagefile>       "),
 		  _("install package"));
-    printHelpLine(_("      --excludepath <path>"),
-		  _("skip files in path <path>"));
-    printHelpLine(_("      --relocate <oldpath>=<newpath>"),
-		  _("relocate files from <oldpath> to <newpath>"));
-    printHelpLine(  "      --badreloc",
-		  _("relocate files even though the package doesn't allow it"));
-    printHelpLine(_("      --prefix <dir>      "),
-		  _("relocate the package to <dir>, if relocatable"));
-    printHelpLine(_("      --dbpath <dir>      "),
-		  _("use <dir> as the directory for the database"));
-    printHelpLine(  "      --excludedocs       ",
+    printHelpLine(  "     --allfiles           ",
+		  _("install all files, even configurations which might "
+		    "otherwise be skipped"));
+    printHelpLine(  "     --badreloc           ",
+		  _("relocate files in non-relocateable package"));
+    printHelpLine(  "     --excludedocs        ",
 		  _("do not install documentation"));
-    printHelpLine(  "      --force             ",
+    printHelpLine(_("     --excludepath <path> "),
+		  _("skip files with leading component <path> "));
+    printHelpLine(  "     --force              ",
 		  _("short hand for --replacepkgs --replacefiles"));
-    puts(           "      -h");
-    printHelpLine(  "      --hash              ",
+    printHelpLine(  "     -h, --hash           ",
 		  _("print hash marks as package installs (good with -v)"));
-    printHelpLine(  "      --allfiles          ",
-		  _("install all files, even configurations which might "
-		    "otherwise be skipped"));
-    printHelpLine(  "      --ignorearch        ",
+    printHelpLine(  "     --ignorearch         ",
 		  _("don't verify package architecture"));
-    printHelpLine(  "      --ignoresize        ",
+    printHelpLine(  "     --ignoresize         ",
 		  _("don't check disk space before installing"));
-    printHelpLine(  "      --ignoreos          ",
+    printHelpLine(  "     --ignoreos           ",
 		  _("don't verify package operating system"));
-    printHelpLine(  "      --includedocs       ",
+    printHelpLine(  "     --includedocs        ",
 		  _("install documentation"));
-    printHelpLine(  "      --justdb            ",
+    printHelpLine(  "     --justdb             ",
 		  _("update the database, but do not modify the filesystem"));
-    printHelpLine(  "      --nodeps            ",
+    printHelpLine(  "     --nodeps             ",
 		  _("do not verify package dependencies"));
-    printHelpLine(  "      --noorder           ",
+    printHelpLine(  "     --noorder            ",
 		  _("do not reorder package installation to satisfy dependencies"));
-    printHelpLine(  "      --noscripts         ",
-		  _("don't execute any installation scripts"));
-    printHelpLine(  "      --notriggers        ",
-		  _("don't execute any scripts triggered by this package"));
-    printHelpLine(  "      --percent           ",
+    printHelpLine(  "     --noscripts          ",
+		  _("don't execute any installation scriptlets"));
+    printHelpLine(  "     --notriggers         ",
+		  _("don't execute any scriptlets triggered by this package"));
+    printHelpLine(  "     --percent            ",
 		  _("print percentages as package installs"));
-    printHelpLine(  "      --replacefiles      ",
+    printHelpLine(_("     --prefix <dir>       "),
+		  _("relocate the package to <dir>, if relocatable"));
+    printHelpLine(_("     --relocate <oldpath>=<newpath>"),
+		  _("relocate files from <oldpath> to <newpath>"));
+    printHelpLine(  "     --replacefiles       ",
 		  _("install even if the package replaces installed files"));
-    printHelpLine(  "      --replacepkgs       ",
+    printHelpLine(  "     --replacepkgs        ",
 		  _("reinstall if the package is already present"));
-    printHelpLine(_("      --root <dir>        "),
-		  _("use <dir> as the top level directory"));
-    printHelpLine(  "      --test              ",
+    printHelpLine(  "     --test               ",
 		  _("don't install, but tell if it would work or not"));
     puts("");
-    puts(         _("    --upgrade <packagefile>"));
-    printHelpLine(_("    -U <packagefile>      "),
+    puts(         _("   --upgrade <packagefile>"));
+    printHelpLine(_("   -U <packagefile>       "),
 		  _("upgrade package (same options as --install, plus)"));
-    printHelpLine(  "      --oldpackage        ",
+    printHelpLine(  "     --oldpackage         ",
 		  _("upgrade to an old version of the package (--force on upgrades does this automatically)"));
     puts("");
-    puts(         _("    --erase <package>"));
-    printHelpLine(  "    -e <package>          ",
+    puts(         _("   --erase <package>"));
+    printHelpLine(  "   -e <package>           ",
 		  _("erase (uninstall) package"));
-    printHelpLine(  "      --allmatches        ",
+    printHelpLine(  "     --allmatches         ",
 		  _("remove all packages which match <package> (normally an error is generated if <package> specified multiple packages)"));
-    printHelpLine(_("      --dbpath <dir>      "),
-		  _("use <dir> as the directory for the database"));
-    printHelpLine(  "      --justdb            ",
+    printHelpLine(  "     --justdb             ",
 		  _("update the database, but do not modify the filesystem"));
-    printHelpLine(  "      --nodeps            ",
+    printHelpLine(  "     --nodeps             ",
 		  _("do not verify package dependencies"));
-    printHelpLine(  "      --noorder           ",
+    printHelpLine(  "     --noorder            ",
 		  _("do not reorder package installation to satisfy dependencies"));
-    printHelpLine(  "      --noscripts         ",
+    printHelpLine(  "     --noscripts          ",
 		  _("do not execute any package specific scripts"));
-    printHelpLine(  "      --notriggers        ",
+    printHelpLine(  "     --notriggers         ",
 		  _("don't execute any scripts triggered by this package"));
-    printHelpLine(_("      --root <dir>        "),
-		  _("use <dir> as the top level directory"));
+#endif	/* IAM_RPMEIU */
+
+#ifdef	IAM_RPMBT
     puts("");
-    puts(         _("    -b<stage> <spec>      "));
-    printHelpLine(_("    -t<stage> <tarball>   "),
+    puts(         _("   -b<stage> <spec>       "));
+    printHelpLine(_("   -t<stage> <tarball>    "),
 		  _("build package, where <stage> is one of:"));
-    printHelpLine(  "          p               ",
+    printHelpLine(  "         p                ",
 		  _("prep (unpack sources and apply patches)"));
-    printHelpLine(  "          l               ",
+    printHelpLine(  "         l                ",
 		  _("list check (do some cursory checks on %files)"));
-    printHelpLine(  "          c               ",
+    printHelpLine(  "         c                ",
 		  _("compile (prep and compile)"));
-    printHelpLine(  "          i               ",
+    printHelpLine(  "         i                ",
 		  _("install (prep, compile, install)"));
-    printHelpLine(  "          b               ",
+    printHelpLine(  "         b                ",
 		  _("binary package (prep, compile, install, package)"));
-    printHelpLine(  "          a               ",
+    printHelpLine(  "         a                ",
 		  _("bin/src package (prep, compile, install, package)"));
-    printHelpLine(  "      --short-circuit     ",
+    printHelpLine(  "         s                ",
+		  _("package src rpm only"));
+    printHelpLine(  "     --short-circuit      ",
 		  _("skip straight to specified stage (only for c,i)"));
-    printHelpLine(  "      --clean             ",
+    printHelpLine(  "     --clean              ",
 		  _("remove build tree when done"));
-    printHelpLine(  "      --rmsource          ",
-		  _("remove sources and spec file when done"));
-    printHelpLine(  "      --sign              ",
+    printHelpLine(  "     --rmsource           ",
+		  _("remove sources when done"));
+    printHelpLine(  "     --rmspec             ",
+		  _("remove spec file when done"));
+    printHelpLine(  "     --sign               ",
 		  _("generate PGP/GPG signature"));
-    printHelpLine(_("      --buildroot <dir>   "),
+    printHelpLine(_("     --buildroot <dir>    "),
 		  _("use <dir> as the build root"));
-    printHelpLine(_("      --target=<platform>+"),
+    printHelpLine(_("     --target=<platform>+ "),
 		  _("build the packages for the build targets platform1...platformN."));
-    printHelpLine(  "      --nobuild           ",
+    printHelpLine(  "     --nobuild            ",
 		  _("do not execute any stages"));
-    printHelpLine(_("      --timecheck <secs>  "),
-		  _("set the time check to <secs> seconds (0 disables)"));
     puts("");
-    printHelpLine(_("    --rebuild <src_pkg>   "),
+    printHelpLine(_("   --rebuild <src_pkg>    "),
 		  _("install source package, build binary package and remove spec file, sources, patches, and icons."));
-    printHelpLine(_("    --rmsource <spec>     "),
-		  _("remove sources and spec file"));
-    printHelpLine(_("    --recompile <src_pkg> "),
+    printHelpLine(_("   --recompile <src_pkg>  "),
 		  _("like --rebuild, but don't build any package"));
-    printHelpLine(_("    --resign <pkg>+       "),
+#endif	/* IAM_RPMBT */
+
+#ifdef IAM_RPMK
+    puts("");
+    printHelpLine(_("   --resign <pkg>+        "),
 		  _("sign a package (discard current signature)"));
-    printHelpLine(_("    --addsign <pkg>+      "),
+    printHelpLine(_("   --addsign <pkg>+       "),
 		  _("add a signature to a package"));
-    puts(           "    -K");
-    printHelpLine(_("    --checksig <pkg>+     "),
+
+    puts(         _("   --checksig <pkg>+"));
+    printHelpLine(_("   -K <pkg>+             "),
 		  _("verify package signature"));
-    printHelpLine(  "      --nopgp             ",
+    printHelpLine(  "     --nopgp              ",
 		  _("skip any PGP signatures"));
-    printHelpLine(  "      --nogpg             ",
+    printHelpLine(  "     --nogpg              ",
 		  _("skip any GPG signatures"));
-    printHelpLine(  "      --nomd5             ",
+    printHelpLine(  "     --nomd5              ",
 		  _("skip any MD5 signatures"));
-    printHelpLine(  "    --querytags           ",
-		  _("list the tags that can be used in a query format"));
-    printHelpLine(  "    --initdb              ",
-		  _("make sure a valid database exists"));
-    printHelpLine(  "    --rebuilddb           ",
-		  _("rebuild database from existing database"));
-    printHelpLine(_("      --dbpath <dir>      "),
-		  _("use <dir> as the directory for the database"));
-    printHelpLine(  "      --root <dir>        ",
-		  _("use <dir> as the top level directory"));
+#endif	/* IAM_RPMK */
+
+#ifdef	IAM_RPMDB
+    puts("");
+    printHelpLine(  "   --initdb               ",
+		  _("initalize database (unnecessary, legacy use)"));
+    printHelpLine(  "   --rebuilddb            ",
+		  _("rebuild database indices from existing database headers"));
+#endif
+
 }
 
 int main(int argc, const char ** argv)
 {
     enum modes bigMode = MODE_UNKNOWN;
+
+#ifdef	IAM_RPMQV
     QVA_t *qva = &rpmQVArgs;
-    struct rpmBuildArguments *ba = &rpmBArgs;
     enum rpmQVSources QVSource = RPMQV_PACKAGE;
-    int arg;
+    const char * infoCommand[] = { "--info", NULL };
+#endif
+
+#ifdef	IAM_RPMBT
+    struct rpmBuildArguments *ba = &rpmBArgs;
+#endif
+
+#ifdef	IAM_RPMEIU
+    rpmRelocation * relocations = NULL;
+    int numRelocations = 0;
     int installFlags = 0, uninstallFlags = 0, interfaceFlags = 0;
-    int gotDbpath = 0, verifyFlags;
-    int checksigFlags = 0;
-    unsigned long int timeCheck = 0L;
+    const char * installCommand[] = { "--install", NULL };
+    int probFilter = 0;
+    int upgrade = 0;
+#endif
+
+#if defined(IAM_RPMK)
     int addSign = NEW_SIGNATURE;
-    const char * specFile;
-    char * tce;
+    int checksigFlags = 0;
+#endif
+
+#if defined(IAM_RPMBT) || defined(IAM_RPMK)
     char * passPhrase = "";
-    char * cookie = NULL;
+#endif
+
+    int arg;
+    int gotDbpath = 0;
+
     const char * optArg;
     pid_t pipeChild = 0;
-    const char * pkg;
-    char * errString = NULL;
     poptContext optCon;
-    const char * infoCommand[] = { "--info", NULL };
-    const char * installCommand[] = { "--install", NULL };
     int ec = 0;
     int status;
     int p[2];
-    rpmRelocation * relocations = NULL;
-    int numRelocations = 0;
-    int sigTag;
-    int upgrade = 0;
-    int probFilter = 0;
 	
 #if HAVE_MCHECK_H && HAVE_MTRACE
     mtrace();	/* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
 #endif
     setprogname(argv[0]);	/* Retrofit glibc __progname */
 
+    /* XXX glibc churn sanity */
+    if (__progname == NULL) {
+	if ((__progname = strrchr(argv[0], '/')) != NULL) __progname++;
+	else __progname = argv[0];
+    }
+
+    /* Set the major mode based on argv[0] */
+#ifdef	IAM_RPMBT
+    if (!strcmp(__progname, "rpmb"))	bigMode = MODE_BUILD;
+    if (!strcmp(__progname, "rpmt"))	bigMode = MODE_TARBUILD;
+#endif
+#ifdef	IAM_RPMQV
+    if (!strcmp(__progname, "rpmq"))	bigMode = MODE_QUERY;
+    if (!strcmp(__progname, "rpmv"))	bigMode = MODE_VERIFY;
+#endif
+#ifdef	RPMEIU
+    if (!strcmp(__progname, "rpme"))	bigMode = MODE_UNINSTALL;
+    if (!strcmp(__progname, "rpmi"))	bigMode = MODE_INSTALL;
+    if (!strcmp(__progname, "rpmu"))	bigMode = MODE_INSTALL;
+#endif
+
     /* set the defaults for the various command line options */
-    allFiles = 0;
-    allMatches = 0;
-    badReloc = 0;
-    excldocs = 0;
-    force = 0;
     _ftp_debug = 0;
-    ftpProxy = NULL;
-    ftpPort = NULL;
-    httpProxy = NULL;
-    httpPort = NULL;
-    showHash = 0;
-    help = 0;
-    ignoreArch = 0;
-    ignoreOs = 0;
-    ignoreSize = 0;
-    incldocs = 0;
-    initdb = 0;
-    justdb = 0;
-    noDeps = 0;
-    noGpg = 0;
+
 #if HAVE_LIBIO_H && defined(_IO_BAD_SEEN)
     noLibio = 0;
 #else
     noLibio = 1;
 #endif
-    noMd5 = 0;
-    noOrder = 0;
-    noPgp = 0;
-    noScripts = 0;
-    noTriggers = 0;
-    noUsageMsg = 0;
-    oldPackage = 0;
-    showPercents = 0;
-    pipeOutput = NULL;
-    prefix = NULL;
-    queryTags = 0;
-    quiet = 0;
     _rpmio_debug = 0;
-    replaceFiles = 0;
-    replacePackages = 0;
-    rootdir = "/";
-    showrc = 0;
-    signIt = 0;
-    showVersion = 0;
-    specedit = 0;
-    test = 0;
     _url_debug = 0;
 
     /* XXX Eliminate query linkage loop */
+    specedit = 0;
     parseSpecVec = parseSpec;
     freeSpecVec = freeSpec;
 
@@ -643,7 +754,7 @@ int main(int argc, const char ** argv)
 
     /* Make a first pass through the arguments, looking for --rcfile */
     /* We need to handle that before dealing with the rest of the arguments. */
-    optCon = poptGetContext("rpm", argc, argv, optionsTable, 0);
+    optCon = poptGetContext(__progname, argc, argv, optionsTable, 0);
     poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
     poptReadDefaultConfig(optCon, 1);
     poptSetExecPath(optCon, RPMCONFIGDIR, 1);
@@ -673,53 +784,47 @@ int main(int argc, const char ** argv)
 
     poptResetContext(optCon);
 
+#ifdef	IAM_RPMQV
     if (qva->qva_queryFormat) xfree(qva->qva_queryFormat);
     memset(qva, 0, sizeof(*qva));
+#endif
+
+#ifdef	IAM_RPMBT
     if (ba->buildRootOverride) xfree(ba->buildRootOverride);
     if (ba->targets) free(ba->targets);
     memset(ba, 0, sizeof(*ba));
     ba->buildChar = ' ';
+#endif
 
     while ((arg = poptGetNextOpt(optCon)) > 0) {
 	optArg = poptGetOptArg(optCon);
 
 	switch (arg) {
-	  case 'K':
-	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_CHECKSIG)
-		argerror(_("only one major mode may be specified"));
-	    bigMode = MODE_CHECKSIG;
-	    break;
 	    
-	  case 'q':
-	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_QUERY)
-		argerror(_("only one major mode may be specified"));
-	    bigMode = MODE_QUERY;
+	  case 'v':
+	    rpmIncreaseVerbosity();
 	    break;
 
-	  case 'V':
-	  case 'y':
-	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_VERIFY)
-		argerror(_("only one major mode may be specified"));
-	    bigMode = MODE_VERIFY;
+	  case 'i':
+#ifdef	IAM_RPMQV
+	    if (bigMode == MODE_QUERY)
+		poptStuffArgs(optCon, infoCommand);
+#endif
+#ifdef	IAM_RPMEIU
+	    if (bigMode == MODE_INSTALL)
+		/*@-ifempty@*/ ;
+	    if (bigMode == MODE_UNKNOWN)
+		poptStuffArgs(optCon, installCommand);
+#endif
+#ifdef	IAM_RPMBT
+	    ba->buildChar = 'i';
+#endif
 	    break;
 
-	  case 'u':
-	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_UNINSTALL)
-		argerror(_("only one major mode may be specified"));
-	    bigMode = MODE_UNINSTALL;
-	    rpmMessage(RPMMESS_ERROR, _("-u and --uninstall are deprecated and no"
-		    " longer work.\n"));
-	    rpmMessage(RPMMESS_ERROR, _("Use -e or --erase instead.\n"));
-	    exit(EXIT_FAILURE);
-	
-	  case 'e':
-	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_UNINSTALL)
-		argerror(_("only one major mode may be specified"));
-	    bigMode = MODE_UNINSTALL;
-	    break;
-	
+#ifdef	IAM_RPMBT
 	  case 'b':
 	  case 't':
+	  { const char * errString = NULL;
 	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_BUILD)
 		argerror(_("only one major mode may be specified"));
 
@@ -750,22 +855,41 @@ int main(int argc, const char ** argv)
 		argerror(errString);
 		break;
 	    }
+	  } break;
 
-	    break;
-	
-	  case 'v':
-	    rpmIncreaseVerbosity();
+	  case 'a':
+	    ba->buildChar = 'a';
 	    break;
 
-	  case 'i':
-	    if (bigMode == MODE_QUERY)
-		poptStuffArgs(optCon, infoCommand);
-	    else if (bigMode == MODE_INSTALL)
-		/*@-ifempty@*/ ;
-	    else if (bigMode == MODE_UNKNOWN)
-		poptStuffArgs(optCon, installCommand);
+	  case GETOPT_REBUILD:
+	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_REBUILD)
+		argerror(_("only one major mode may be specified"));
+	    bigMode = MODE_REBUILD;
 	    break;
 
+	  case GETOPT_RECOMPILE:
+	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_RECOMPILE)
+		argerror(_("only one major mode may be specified"));
+	    bigMode = MODE_RECOMPILE;
+	    break;
+#endif	/* IAM_RPMBT */
+	
+#ifdef	IAM_RPMEIU
+	  case 'u':
+	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_UNINSTALL)
+		argerror(_("only one major mode may be specified"));
+	    bigMode = MODE_UNINSTALL;
+	    rpmMessage(RPMMESS_ERROR, _("-u and --uninstall are deprecated and no"
+		    " longer work.\n"));
+	    rpmMessage(RPMMESS_ERROR, _("Use -e or --erase instead.\n"));
+	    exit(EXIT_FAILURE);
+	
+	  case 'e':
+	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_UNINSTALL)
+		argerror(_("only one major mode may be specified"));
+	    bigMode = MODE_UNINSTALL;
+	    break;
+	
 	  case GETOPT_INSTALL:
 	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_INSTALL)
 		argerror(_("only one major mode may be specified"));
@@ -779,6 +903,46 @@ int main(int argc, const char ** argv)
 	    upgrade = 1;
 	    break;
 
+	  case GETOPT_EXCLUDEPATH:
+	    if (*optArg != '/') 
+		argerror(_("exclude paths must begin with a /"));
+
+	    relocations = xrealloc(relocations, 
+				  sizeof(*relocations) * (numRelocations + 1));
+	    relocations[numRelocations].oldPath = optArg;
+	    relocations[numRelocations++].newPath = NULL;
+	    break;
+
+	  case GETOPT_RELOCATE:
+	  { char * errString = NULL;
+	    if (*optArg != '/') 
+		argerror(_("relocations must begin with a /"));
+	    if (!(errString = strchr(optArg, '=')))
+		argerror(_("relocations must contain a ="));
+	    *errString++ = '\0';
+	    if (*errString != '/') 
+		argerror(_("relocations must have a / following the ="));
+	    relocations = xrealloc(relocations, 
+				  sizeof(*relocations) * (numRelocations + 1));
+	    relocations[numRelocations].oldPath = optArg;
+	    relocations[numRelocations++].newPath = errString;
+	  } break;
+#endif	/* IAM_RPMEIU */
+
+#ifdef	IAM_RPMQV
+	  case 'q':
+	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_QUERY)
+		argerror(_("only one major mode may be specified"));
+	    bigMode = MODE_QUERY;
+	    break;
+
+	  case 'V':
+	  case 'y':
+	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_VERIFY)
+		argerror(_("only one major mode may be specified"));
+	    bigMode = MODE_VERIFY;
+	    break;
+
 	  case 'p':
 	    if (QVSource != RPMQV_PACKAGE && QVSource != RPMQV_RPM)
 		argerror(_("one type of query/verify may be performed at a " "time"));
@@ -805,17 +969,21 @@ int main(int argc, const char ** argv)
 				"time"));
 	    QVSource = RPMQV_ALL;
 	    break;
+#endif	/* IAM_RPMQV */
 
-	  case GETOPT_REBUILD:
-	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_REBUILD)
+#ifdef	IAM_RPMDB
+	  case GETOPT_REBUILDDB:
+	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_REBUILDDB)
 		argerror(_("only one major mode may be specified"));
-	    bigMode = MODE_REBUILD;
+	    bigMode = MODE_REBUILDDB;
 	    break;
+#endif
 
-	  case GETOPT_RECOMPILE:
-	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_RECOMPILE)
+#ifdef	IAM_RPMK
+	  case 'K':
+	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_CHECKSIG)
 		argerror(_("only one major mode may be specified"));
-	    bigMode = MODE_RECOMPILE;
+	    bigMode = MODE_CHECKSIG;
 	    break;
 
 	  case GETOPT_RESIGN:
@@ -833,6 +1001,7 @@ int main(int argc, const char ** argv)
 	    addSign = ADD_SIGNATURE;
 	    signIt = 1;
 	    break;
+#endif	/* IAM_RPMK */
 
 	  case GETOPT_DBPATH:
 	    switch (urlIsURL(optArg)) {
@@ -861,47 +1030,6 @@ int main(int argc, const char ** argv)
 	    noUsageMsg = 1;
 	  } break;
 
-	  case GETOPT_TIMECHECK:
-	    tce = NULL;
-	    timeCheck = strtoul(optArg, &tce, 10);
-	    if ((*tce) || (tce == optArg) || (timeCheck == ULONG_MAX)) {
-		argerror("Argument to --timecheck must be integer");
-	    }
-	    addMacro(NULL, "_timecheck", NULL, optArg, RMIL_CMDLINE);
-	    addMacro(&rpmCLIMacroContext, "_timecheck", NULL, optArg, RMIL_CMDLINE);
-	    timeCheck = 1;
-	    break;
-
-	  case GETOPT_REBUILDDB:
-	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_REBUILDDB)
-		argerror(_("only one major mode may be specified"));
-	    bigMode = MODE_REBUILDDB;
-	    break;
-
-	  case GETOPT_RELOCATE:
-	    if (*optArg != '/') 
-		argerror(_("relocations must begin with a /"));
-	    if (!(errString = strchr(optArg, '=')))
-		argerror(_("relocations must contain a ="));
-	    *errString++ = '\0';
-	    if (*errString != '/') 
-		argerror(_("relocations must have a / following the ="));
-	    relocations = xrealloc(relocations, 
-				  sizeof(*relocations) * (numRelocations + 1));
-	    relocations[numRelocations].oldPath = optArg;
-	    relocations[numRelocations++].newPath = errString;
-	    break;
-
-	  case GETOPT_EXCLUDEPATH:
-	    if (*optArg != '/') 
-		argerror(_("exclude paths must begin with a /"));
-
-	    relocations = xrealloc(relocations, 
-				  sizeof(*relocations) * (numRelocations + 1));
-	    relocations[numRelocations].oldPath = optArg;
-	    relocations[numRelocations++].newPath = NULL;
-	    break;
-
 	  default:
 	    fprintf(stderr, _("Internal error in argument processing (%d) :-(\n"), arg);
 	    exit(EXIT_FAILURE);
@@ -921,19 +1049,24 @@ int main(int argc, const char ** argv)
 	exit(EXIT_FAILURE);
     }
 
+#ifdef	IAM_RPMBT
     if ((ba->buildAmount & RPMBUILD_RMSOURCE) && bigMode == MODE_UNKNOWN)
 	bigMode = MODE_BUILD;
 
     if ((ba->buildAmount & RPMBUILD_RMSPEC) && bigMode == MODE_UNKNOWN)
 	bigMode = MODE_BUILD;
+#endif	/* IAM_RPMBT */
     
+#ifdef	IAM_RPMDB
     if (initdb) {
 	if (bigMode != MODE_UNKNOWN) 
 	    argerror(_("only one major mode may be specified"));
 	else
 	    bigMode = MODE_INITDB;
     }
+#endif	/* IAM_RPMDB */
 
+#ifdef	IAM_RPMQV
     if (queryTags) {
 	if (bigMode != MODE_UNKNOWN) 
 	    argerror(_("only one major mode may be specified"));
@@ -947,19 +1080,20 @@ int main(int argc, const char ** argv)
 			"time"));
 	QVSource = qva->qva_source;
     }
+#endif
 
+#ifdef	IAM_RPMBT
     if (ba->buildRootOverride && bigMode != MODE_BUILD &&
 	bigMode != MODE_REBUILD && bigMode != MODE_TARBUILD) {
 	argerror("--buildroot may only be used during package builds");
     }
+#endif
 
     if (gotDbpath && (bigMode & ~MODES_FOR_DBPATH))
 	argerror(_("--dbpath given for operation that does not use a "
 			"database"));
 
-    if (timeCheck && (bigMode & ~MODES_FOR_TIMECHECK))
-	argerror(_("--timecheck may only be used during package builds"));
-    
+#ifdef	IAM_RPMQV
     if (qva->qva_flags && (bigMode & ~MODES_QV)) 
 	argerror(_("unexpected query flags"));
 
@@ -968,13 +1102,25 @@ int main(int argc, const char ** argv)
 
     if (QVSource != RPMQV_PACKAGE && (bigMode & ~MODES_QV)) 
 	argerror(_("unexpected query source"));
+#endif	/* IAM_RPMQV */
 
-    if (!(bigMode == MODE_INSTALL ||
+#if defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+
+    if (!(
+#ifdef	IAM_RPMEIU
+	 bigMode == MODE_INSTALL ||
+#endif
+#ifdef	IAM_RPMBT
 	 (bigMode==MODE_BUILD && (ba->buildAmount & RPMBUILD_RMSOURCE))||
-	 (bigMode==MODE_BUILD && (ba->buildAmount & RPMBUILD_RMSPEC))) 
-	&& force)
+	 (bigMode==MODE_BUILD && (ba->buildAmount & RPMBUILD_RMSPEC))
+#else
+	0
+#endif
+	) && force)
 	argerror(_("only installation, upgrading, rmsource and rmspec may be forced"));
+#endif	/* IAM_RPMEIU || IAM_RPMBT */
 
+#ifdef	IAM_RPMEIU
     if (bigMode != MODE_INSTALL && badReloc)
 	argerror(_("files may only be relocated during package installation"));
 
@@ -1041,16 +1187,22 @@ int main(int argc, const char ** argv)
     if (justdb && bigMode != MODE_INSTALL && bigMode != MODE_UNINSTALL)
 	argerror(_("--justdb may only be specified during package "
 		   "installation and erasure"));
+#endif	/* IAM_RPMEIU */
 
+#if defined(IAM_RPMQV) || defined(IAM_RPMEIU)
     if (bigMode != MODE_INSTALL && bigMode != MODE_UNINSTALL && 
 	bigMode != MODE_VERIFY && noScripts)
 	argerror(_("--noscripts may only be specified during package "
 		   "installation, erasure, and verification"));
+#endif	/* IAM_RPMQV || IAM_RPMEIU */
 
+#if defined(IAM_RPMEIU)
     if (bigMode != MODE_INSTALL && bigMode != MODE_UNINSTALL && noTriggers)
 	argerror(_("--notriggers may only be specified during package "
-		   "installation, erasure, and verification"));
+		   "installation and erasure"));
+#endif	/* IAM_RPMEIU */
 
+#if defined(IAM_RPMBT) || defined(IAM_RPMEIU)
     if (noDeps & (bigMode & ~MODES_FOR_NODEPS))
 	argerror(_("--nodeps may only be specified during package "
 		   "building, rebuilding, recompilation, installation,"
@@ -1059,6 +1211,7 @@ int main(int argc, const char ** argv)
     if (test && (bigMode & ~MODES_FOR_TEST))
 	argerror(_("--test may only be specified during package installation, "
 		 "erasure, and building"));
+#endif	/* IAM_RPMBT || IAM_RPMEIU */
 
     if (rootdir[1] && (bigMode & ~MODES_FOR_ROOT))
 	argerror(_("--root (-r) may only be specified during "
@@ -1078,31 +1231,56 @@ int main(int argc, const char ** argv)
 	}
     }
 
+#ifdef	IAM_RPMEIU
     if (oldPackage && !upgrade)
 	argerror(_("--oldpackage may only be used during upgrades"));
+#endif
 
-    if ((ftpProxy || ftpPort) && !(bigMode == MODE_INSTALL ||
+#ifdef	DYING
+    if ((ftpProxy || ftpPort) && !(
+#ifdef	IAM_RPMEIU
+	bigMode == MODE_INSTALL ||
+#endif
+#ifdef	IAM_RPMQV
 	((bigMode == MODE_QUERY && QVSource == RPMQV_RPM)) ||
-	((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM))))
+	((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM))
+#else
+	0
+#endif
+	))
 	argerror(_("ftp options can only be used during package queries, "
 		 "installs, and upgrades"));
 
-    if ((httpProxy || httpPort) && !(bigMode == MODE_INSTALL ||
+    if ((httpProxy || httpPort) && !(
+#ifdef	IAM_RPMEIU
+	bigMode == MODE_INSTALL ||
+#endif
+#ifdef	IAM_RPMQV
 	((bigMode == MODE_QUERY && QVSource == RPMQV_RPM)) ||
-	((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM))))
+	((bigMode == MODE_VERIFY && QVSource == RPMQV_RPM))
+#else
+	0
+#endif
+	))
 	argerror(_("http options can only be used during package queries, "
 		 "installs, and upgrades"));
+#endif	/* DYING */
 
+#ifdef	IAM_RPMK
     if (noPgp && bigMode != MODE_CHECKSIG)
 	argerror(_("--nopgp may only be used during signature checking"));
 
     if (noGpg && bigMode != MODE_CHECKSIG)
 	argerror(_("--nogpg may only be used during signature checking"));
+#endif
 
+#if defined(IAM_RPMK) || defined(IAM_RPMQV)
     if (noMd5 && bigMode != MODE_CHECKSIG && bigMode != MODE_VERIFY)
 	argerror(_("--nomd5 may only be used during signature checking and "
 		   "package verification"));
+#endif
 
+#ifdef	DYING
     if (ftpProxy) {
 	addMacro(NULL, "_ftpproxy", NULL, ftpProxy, RMIL_CMDLINE);
 	addMacro(&rpmCLIMacroContext, "_ftpproxy", NULL, ftpProxy, RMIL_CMDLINE);
@@ -1119,7 +1297,9 @@ int main(int argc, const char ** argv)
 	addMacro(NULL, "_httpport", NULL, httpPort, RMIL_CMDLINE);
 	addMacro(&rpmCLIMacroContext, "_httpport", NULL, httpPort, RMIL_CMDLINE);
     }
+#endif	/* DYING */
 
+#if defined(IAM_RPMBT) || defined(IAM_RPMK)
     if (signIt) {
         if (bigMode == MODE_REBUILD || bigMode == MODE_BUILD ||
 	    bigMode == MODE_RESIGN || bigMode == MODE_TARBUILD) {
@@ -1142,6 +1322,7 @@ int main(int argc, const char ** argv)
 	    if (errors) return errors;
 
             if (poptPeekArg(optCon)) {
+		int sigTag;
 		switch (sigTag = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY)) {
 		  case 0:
 		    break;
@@ -1174,6 +1355,7 @@ int main(int argc, const char ** argv)
     	/* Make rpmLookupSignatureType() return 0 ("none") from now on */
         rpmLookupSignatureType(RPMLOOKUPSIG_DISABLE);
     }
+#endif	/* IAM_RPMBT || IAM_RPMK */
 
     if (pipeOutput) {
 	pipe(p);
@@ -1192,46 +1374,33 @@ int main(int argc, const char ** argv)
     }
 	
     switch (bigMode) {
-      case MODE_UNKNOWN:
-	if (!showVersion && !help && !noUsageMsg) printUsage();
+#ifdef	IAM_RPMDB
+      case MODE_INITDB:
+	rpmdbInit(rootdir, 0644);
 	break;
 
       case MODE_REBUILDDB:
 	ec = rpmdbRebuild(rootdir);
 	break;
-
+      case MODE_QUERY:
+      case MODE_VERIFY:
       case MODE_QUERYTAGS:
-	if (argc != 2)
-	    argerror(_("unexpected arguments to --querytags "));
-
-	rpmDisplayQueryTags(stdout);
-	break;
-
-      case MODE_INITDB:
-	rpmdbInit(rootdir, 0644);
-	break;
-
+      case MODE_INSTALL:
+      case MODE_UNINSTALL:
+      case MODE_BUILD:
+      case MODE_REBUILD:
+      case MODE_RECOMPILE:
+      case MODE_TARBUILD:
       case MODE_CHECKSIG:
-	if (!poptPeekArg(optCon))
-	    argerror(_("no packages given for signature check"));
-	if (!noPgp) checksigFlags |= CHECKSIG_PGP;
-	if (!noGpg) checksigFlags |= CHECKSIG_GPG;
-	if (!noMd5) checksigFlags |= CHECKSIG_MD5;
-	ec = rpmCheckSig(checksigFlags, (const char **)poptGetArgs(optCon));
-	/* XXX don't overflow single byte exit status */
-	if (ec > 255) ec = 255;
-	break;
-
       case MODE_RESIGN:
-	if (!poptPeekArg(optCon))
-	    argerror(_("no packages given for signing"));
-	ec = rpmReSign(addSign, passPhrase, (const char **)poptGetArgs(optCon));
-	/* XXX don't overflow single byte exit status */
-	if (ec > 255) ec = 255;
+	if (!showVersion && !help && !noUsageMsg) printUsage();
 	break;
-	
+#endif	/* IAM_RPMDB */
+
+#ifdef	IAM_RPMBT
       case MODE_REBUILD:
       case MODE_RECOMPILE:
+      { const char * pkg;
         if (rpmGetVerbosity() == RPMMESS_NORMAL)
 	    rpmSetVerbosity(RPMMESS_VERBOSE);
 
@@ -1248,21 +1417,28 @@ int main(int argc, const char ** argv)
 	}
 
 	while ((pkg = poptGetArg(optCon))) {
+	    const char * specFile = NULL;
+	    char * cookie = NULL;
+
 	    ec = rpmInstallSource("", pkg, &specFile, &cookie);
 	    if (ec)
 		break;
 
 	    ba->rootdir = rootdir;
 	    ec = build(specFile, ba, passPhrase, 0, cookie, rcfile, force, noDeps);
-	    if (ec)
-		break;
 	    free(cookie);
+	    cookie = NULL;
 	    xfree(specFile);
+	    specFile = NULL;
+
+	    if (ec)
+		break;
 	}
-	break;
+      }	break;
 
       case MODE_BUILD:
       case MODE_TARBUILD:
+      { const char * pkg;
         if (rpmGetVerbosity() == RPMMESS_NORMAL)
 	    rpmSetVerbosity(RPMMESS_VERBOSE);
        
@@ -1313,8 +1489,22 @@ int main(int argc, const char ** argv)
 	    rpmFreeMacros(NULL);
 	    rpmReadConfigFiles(rcfile, NULL);
 	}
+      }	break;
+
+      case MODE_QUERY:
+      case MODE_VERIFY:
+      case MODE_QUERYTAGS:
+      case MODE_INSTALL:
+      case MODE_UNINSTALL:
+      case MODE_CHECKSIG:
+      case MODE_RESIGN:
+      case MODE_INITDB:
+      case MODE_REBUILDDB:
+	if (!showVersion && !help && !noUsageMsg) printUsage();
 	break;
+#endif	/* IAM_RPMBT */
 
+#ifdef	IAM_RPMEIU
       case MODE_UNINSTALL:
 	if (!poptPeekArg(optCon))
 	    argerror(_("no packages given for uninstall"));
@@ -1385,8 +1575,25 @@ int main(int argc, const char ** argv)
 	ec += rpmInstall(rootdir, (const char **)poptGetArgs(optCon), 
 			installFlags, interfaceFlags, probFilter, relocations);
 	break;
+      case MODE_QUERY:
+      case MODE_VERIFY:
+      case MODE_QUERYTAGS:
+      case MODE_BUILD:
+      case MODE_REBUILD:
+      case MODE_RECOMPILE:
+      case MODE_TARBUILD:
+      case MODE_CHECKSIG:
+      case MODE_RESIGN:
+      case MODE_INITDB:
+      case MODE_REBUILDDB:
+	if (!showVersion && !help && !noUsageMsg) printUsage();
+	break;
+#endif	/* IAM_RPMEIU */
 
+#ifdef	IAM_RPMQV
       case MODE_QUERY:
+      { const char * pkg;
+
 	qva->qva_prefix = rootdir;
 	if (QVSource == RPMQV_ALL) {
 	    if (poptPeekArg(optCon))
@@ -1399,9 +1606,12 @@ int main(int argc, const char ** argv)
 	    while ((pkg = poptGetArg(optCon)))
 		ec += rpmQuery(qva, QVSource, pkg);
 	}
-	break;
+      }	break;
 
       case MODE_VERIFY:
+      { const char * pkg;
+	int verifyFlags;
+
 	verifyFlags = (VERIFY_FILES|VERIFY_DEPS|VERIFY_SCRIPT|VERIFY_MD5);
 	verifyFlags &= ~qva->qva_flags;
 	if (noDeps)	verifyFlags &= ~VERIFY_DEPS;
@@ -1420,7 +1630,67 @@ int main(int argc, const char ** argv)
 	    while ((pkg = poptGetArg(optCon)))
 		ec += rpmVerify(qva, QVSource, pkg);
 	}
+      }	break;
+
+      case MODE_QUERYTAGS:
+	if (argc != 2)
+	    argerror(_("unexpected arguments to --querytags "));
+
+	rpmDisplayQueryTags(stdout);
+	break;
+
+      case MODE_INSTALL:
+      case MODE_UNINSTALL:
+      case MODE_BUILD:
+      case MODE_REBUILD:
+      case MODE_RECOMPILE:
+      case MODE_TARBUILD:
+      case MODE_CHECKSIG:
+      case MODE_RESIGN:
+      case MODE_INITDB:
+      case MODE_REBUILDDB:
+	if (!showVersion && !help && !noUsageMsg) printUsage();
+	break;
+#endif	/* IAM_RPMQV */
+
+#ifdef IAM_RPMK
+      case MODE_CHECKSIG:
+	if (!poptPeekArg(optCon))
+	    argerror(_("no packages given for signature check"));
+	if (!noPgp) checksigFlags |= CHECKSIG_PGP;
+	if (!noGpg) checksigFlags |= CHECKSIG_GPG;
+	if (!noMd5) checksigFlags |= CHECKSIG_MD5;
+	ec = rpmCheckSig(checksigFlags, (const char **)poptGetArgs(optCon));
+	/* XXX don't overflow single byte exit status */
+	if (ec > 255) ec = 255;
+	break;
+
+      case MODE_RESIGN:
+	if (!poptPeekArg(optCon))
+	    argerror(_("no packages given for signing"));
+	ec = rpmReSign(addSign, passPhrase, (const char **)poptGetArgs(optCon));
+	/* XXX don't overflow single byte exit status */
+	if (ec > 255) ec = 255;
+	break;
+      case MODE_QUERY:
+      case MODE_VERIFY:
+      case MODE_QUERYTAGS:
+      case MODE_INSTALL:
+      case MODE_UNINSTALL:
+      case MODE_BUILD:
+      case MODE_REBUILD:
+      case MODE_RECOMPILE:
+      case MODE_TARBUILD:
+      case MODE_INITDB:
+      case MODE_REBUILDDB:
+	if (!showVersion && !help && !noUsageMsg) printUsage();
 	break;
+#endif	/* IAM_RPMK */
+	
+      case MODE_UNKNOWN:
+	if (!showVersion && !help && !noUsageMsg) printUsage();
+	break;
+
     }
 
     poptFreeContext(optCon);
@@ -1437,9 +1707,15 @@ int main(int argc, const char ** argv)
     freeNames();
     freeFilesystems();
     urlFreeCache();
+
+#ifdef	IAM_RPMQV
     if (qva->qva_queryFormat) xfree(qva->qva_queryFormat);
+#endif
+
+#ifdef	IAM_RPMBT
     if (ba->buildRootOverride) xfree(ba->buildRootOverride);
     if (ba->targets) free(ba->targets);
+#endif
 
 #if HAVE_MCHECK_H && HAVE_MTRACE
     muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
diff --git a/scripts/freshen.sh b/scripts/freshen.sh
index 9e46f0e39..ef473ed92 100755
--- a/scripts/freshen.sh
+++ b/scripts/freshen.sh
@@ -6,13 +6,11 @@
 # specified (i.e. filenames with " specified). I'm sure some shell-hacker
 # out there can fix that <hint, hint>.
 
-if [ $1 = ";" ]; then
-    RPM=rpm
-    shift
-else
-    RPM=$1
-    shift 2
-fi
+case `basename $0` in
+rpme|rpmi|rpmu)	rpm="$0" ;;
+*)		rpm="`dirname $0`/rpmi" ;;
+esac
+shift
 
 args="-U"
 while [ $# -gt 0 ]; do
diff --git a/system.h b/system.h
index a6bb90ba7..82e89ac79 100644
--- a/system.h
+++ b/system.h
@@ -221,6 +221,9 @@ void *vmefail(size_t size);
 
 /* Retrofit glibc __progname */
 #if defined __GLIBC__ && __GLIBC__ >= 2
+#if __GLIBC_MINOR__ >= 1
+#define	__progname	__assert_program_name
+#endif
 #define	setprogname(pn)
 #else
 #define	__progname	program_name
@@ -229,7 +232,7 @@ void *vmefail(size_t size);
     else __progname = pn;		\
   }
 #endif
-char *__progname;
+const char *__progname;
 
 #if HAVE_NETDB_H
 #ifndef __LCLINT__