- fix: headerLoad segfault in python bindings.

CVS patchset: 4339
CVS date: 2000/12/12 21:05:49

59 files changed, 3042 insertions, 1497 deletions

diff --git a/po/cs.po b/po/cs.po
index 4bec0838d..e7429b077 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -156,7 +156,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <adr>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -196,7 +196,7 @@ msgstr "                        soubor1.rpm ... souborN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <adr>] [--rcfile <soubor>]"
 
@@ -312,7 +312,7 @@ msgstr "definování makra <jméno> s obsahem <tělo>"
 msgid "    --eval '<name>+'      "
 msgstr "    --pipe <příkaz>       "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr "vypsat používanou verzi rpm"
 
@@ -328,7 +328,7 @@ msgstr "odeslat stdout do <příkazu>"
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <soubor>    "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "použijte <soubor> místo /etc/rpmrc a $HOME/.rpmrc"
 
@@ -1174,8 +1174,8 @@ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <adr>]\n"
 
 #: rpmqv.c:301
-#, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+#, fuzzy, c-format
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <soubor>] [--dbpath <adr>]\n"
 
 #: rpmqv.c:305
@@ -1185,15 +1185,37 @@ msgid ""
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <soubor>] [--ignorearch] [--dbpath <adr>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <soubor>]"
+
 #: rpmqv.c:325
-#, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]\n"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr "                        [--scripts] [--root <adr>] [--rcfile <soubor>]"
+
 #: rpmqv.c:339
-#, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]\n"
 
@@ -1208,10 +1230,10 @@ msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [cíl]\n"
 
 #: rpmqv.c:348
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
 "<soubor>]\n"
@@ -1225,21 +1247,23 @@ msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] spec_soubor"
 
 #: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+#, fuzzy, c-format
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <soubor>] [-v] spec_soubor\n"
 
 #: rpmqv.c:353
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
 
 #: rpmqv.c:354
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
 
@@ -1249,21 +1273,24 @@ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "       %s {--freshen -F} soubor1.rpm ... souborN.rpm\n"
 
 #: rpmqv.c:359
-#, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 "       %s {--resign} [--rcfile <soubor>] balíček1 balíček2 ... balíčekN\n"
 
 #: rpmqv.c:360
-#, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+#, fuzzy, c-format
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 "       %s {--addsign} [--rcfile <soubor>] balíček1 balíček2 ... balíčekN"
 
 #: rpmqv.c:361
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <soubor>]\n"
 
@@ -1276,16 +1303,27 @@ msgid "   --define '<name> <body>'"
 msgstr "   --define '<jméno> <tělo>'"
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+#, fuzzy
+msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<příkaz>+'     "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "vypsat používanou verzi rpm"
+
 #: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <příkaz>       "
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
-msgstr "      --rcfile <soubor>   "
+#, fuzzy
+msgid "   --macros <file:...>    "
+msgstr "Použijte volbu -e nebo --erase.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 msgid "   --dbpath <dir>         "
@@ -2350,47 +2388,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "%s: %-45s ANO (db soubory)\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) přidáno do keše závislostí.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíček %s koliduje: %s\n"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraňuji \"%s\" z indexu %s.\n"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2533,7 +2576,7 @@ msgstr ""
 "na http://www.rpm.org nebo v diskuzním listu rpm-list@redhat.com.\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(není číslo)"
 
@@ -2562,79 +2605,93 @@ msgid "file %s is on an unknown device"
 msgstr "soubor %s je na neznámém zařízení"
 
 #. This should not be allowed
-#: lib/header.c:215
+#: lib/header.c:218
 #, fuzzy
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Počet RPM_STRING_TYPE pro grabData() musí být 1.\n"
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datový typ %d není podporován\n"
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Chybný počet pro headerAddEntry(): %d\n"
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "chybí { po %"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "po %{ chybí }"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "prázdný formát značky"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "prázdné jméno značky"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "neznámá značka"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "na konci pole očekáváno ]"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "neočekávaná ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "neočekávaná }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "ve výrazu očekáván ?"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr "ve výrazu je po ? očekávána {"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "ve výrazu je očekávána }"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr "v podvýrazu je po ? očekávána :"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr "ve výrazu je po : očekávána {"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "na konci výrazu je očekáváno |"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(neznámý typ)"
 
@@ -4036,6 +4093,9 @@ msgstr "nemohu otevřít %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvořit %s: %s\n"
 
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "      --rcfile <soubor>   "
+
 #~ msgid "sigsize         : %d\n"
 #~ msgstr "velikost podpisu: %d\n"
 
diff --git a/po/da.po b/po/da.po
index 7c64372c2..d8b748d98 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -157,7 +157,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <kat>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -196,7 +196,7 @@ msgstr "                        fil-1.rpm ... fil-N.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
@@ -313,7 +313,7 @@ msgstr "definér makro <name> med vćrdi <body>"
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<name>+'      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -329,7 +329,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr "    --rcfile <fil>        "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1147,8 +1147,8 @@ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <katalog>]\n"
 
 #: rpmqv.c:301
-#, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+#, fuzzy, c-format
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]\n"
 
 #: rpmqv.c:305
@@ -1158,15 +1158,37 @@ msgid ""
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
+
 #: rpmqv.c:325
-#, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]\n"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
+
 #: rpmqv.c:339
-#, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]\n"
 
@@ -1181,10 +1203,10 @@ msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [mĺl]\n"
 
 #: rpmqv.c:348
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<fil>]\n"
@@ -1198,21 +1220,23 @@ msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] spec-fil"
 
 #: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+#, fuzzy, c-format
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <fil>] [-v] 'spec'-fil\n"
 
 #: rpmqv.c:353
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
 
 #: rpmqv.c:354
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
 
@@ -1222,19 +1246,22 @@ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "       %s {--freshen -F} fil1.rpm ... filN.rpm\n"
 
 #: rpmqv.c:359
-#, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN\n"
 
 #: rpmqv.c:360
-#, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgstr "       rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
 #: rpmqv.c:361
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]\n"
 
@@ -1247,16 +1274,27 @@ msgid "   --define '<name> <body>'"
 msgstr "   --define '<name> <body>'"
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+#, fuzzy
+msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<name>+'       "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "vis versionen af rpm som benyttes"
+
 #: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr "   --pipe <kmd>           "
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
-msgstr "   --rcfile <fil>         "
+#, fuzzy
+msgid "   --macros <file:...>    "
+msgstr "    --rcfile <fil>        "
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 msgid "   --dbpath <dir>         "
@@ -2316,46 +2354,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2494,7 +2537,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2523,78 +2566,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
@@ -3965,6 +4022,9 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr ""
 
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "   --rcfile <fil>         "
+
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "intern fejl (rpm fejl?): "
 
diff --git a/po/de.po b/po/de.po
index 2b796fb56..9f6c130ac 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -153,7 +153,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -202,7 +202,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <VERZ>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -243,7 +243,7 @@ msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
 
@@ -367,7 +367,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "Die benutzte RPM-Version anzeigen"
@@ -386,7 +386,7 @@ msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
 msgid "    --rcfile <file>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "<DATEI> anstelle von /etc/rpmrc und $HOME/.rpmrc benutzen"
 
@@ -1291,7 +1291,7 @@ msgstr "       rpm {--initdb}   [--dbpath <VERZ>]"
 
 #: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <DATEI>] [--dbpath <VERZ>]"
 
 #: rpmqv.c:305
@@ -1300,15 +1300,37 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <DATEI>] [--ignorearch] [--dbpath <VERZ>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <DATEI>]"
+
 #: rpmqv.c:325
 #, fuzzy, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr "                        [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
+
 #: rpmqv.c:339
 #, fuzzy, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
 
 #: rpmqv.c:343
@@ -1324,8 +1346,8 @@ msgstr "       rpm {--setugids} [-afpg] [ZIEL]"
 #: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<DATEI>]"
@@ -1342,20 +1364,22 @@ msgstr "                        [--buildarch <ARCH>] [--rmsource] SPEC-DATEI"
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       rpm {--rmsource} [--rcfile <DATAEI>] [-v] SPEC-DATEI"
 
 #: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
 
 #: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
 
@@ -1366,18 +1390,21 @@ msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 
 #: rpmqv.c:359
 #, fuzzy, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
 #: rpmqv.c:360
 #, fuzzy, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
 #: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <DATEI>]"
 
 #: rpmqv.c:405
@@ -1391,9 +1418,14 @@ msgstr ""
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "    -b<STUFE> <SPEC>      "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "Die benutzte RPM-Version anzeigen"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1401,8 +1433,12 @@ msgstr "    -b<STUFE> <SPEC>      "
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "    -b<STUFE> <SPEC>      "
+msgid "   --macros <file:...>    "
+msgstr "Benutzen Sie stattdessen -e oder --erase\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2557,48 +2593,53 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # FIXME
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2738,7 +2779,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(keine Zahl)"
 
@@ -2769,81 +2810,95 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "fehlende { nach %{"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "fehlende } nach %{"
 
 # ťTagŤ übersetzen??? -ke-
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "leeres ťTagŤ-Format"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "leerer ťTagŤ-Name"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "unbekannter ťTagŤ"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "] am Ende des Arrays erwartet"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "unerwartete ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "unerwartete }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "? im Ausdruck erwartet"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ nach ? im Ausdruck erwartet"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "} im Ausdruck erwartet"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ": nach ? Unterausdruck erwartet"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ nach : im Ausdruck erwartet"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "| am Ende des Ausdrucks erwartet"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(unbekannter Typ)"
 
@@ -4305,6 +4360,10 @@ msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 #, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#, fuzzy
 #~ msgid "New Header signature\n"
 #~ msgstr "nicht möglich, die Signatur zu lesen"
 
@@ -4350,10 +4409,6 @@ msgstr "anlegen von %s fehlgeschlagen\n"
 #~ msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
 
 #, fuzzy
-#~ msgid "%s: %-45s YES (db packages)\n"
-#~ msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "       rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 #~ "<file>]"
diff --git a/po/es.po b/po/es.po
index b6b43ac46..faeb986de 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 8b1337890..a3d553633 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -111,7 +111,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -160,7 +160,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <hakem>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -201,7 +201,7 @@ msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
@@ -329,7 +329,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "tulosta käytetyn rpm:n versio"
@@ -348,7 +348,7 @@ msgstr "lähetä vakiotuloste <komento>:lle"
 msgid "    --rcfile <file>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "käytä <tiedosto> eikä /etc/rpmrc tai $HOME/.rpmrc"
 
@@ -1243,7 +1243,7 @@ msgstr "       rpm {--initdb}   [--dbpath <hakem>]"
 
 #: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <tiedosto>] [--dbpath <hakem>]"
 
 #: rpmqv.c:305
@@ -1252,15 +1252,39 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <tiedosto>] [--ignorearch] [--dbpath "
+"<hakem>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <tiedosto>]"
+
 #: rpmqv.c:325
 #, fuzzy, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+"                        [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
+
 #: rpmqv.c:339
 #, fuzzy, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
 
@@ -1277,8 +1301,8 @@ msgstr "       rpm {--setugids} [-afpg] [kohde]"
 #: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<tiedosto>]"
@@ -1296,13 +1320,14 @@ msgstr ""
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
 
 #: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
 "lähdekoodiN.rpm"
@@ -1310,7 +1335,8 @@ msgstr ""
 #: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
 "lähdekoodiN.rpm"
@@ -1322,20 +1348,23 @@ msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
 #: rpmqv.c:359
 #, fuzzy, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 "       rpm {--resign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
 #: rpmqv.c:360
 #, fuzzy, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
 #: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <tiedosto>]"
 
 #: rpmqv.c:405
@@ -1349,9 +1378,14 @@ msgstr ""
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "    -b<vaihe> <määrittely> "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "tulosta käytetyn rpm:n versio"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1359,8 +1393,12 @@ msgstr "    -b<vaihe> <määrittely> "
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "    -b<vaihe> <määrittely> "
+msgid "   --macros <file:...>    "
+msgstr "Käytä sen sijaan -e tai --erase .\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2482,47 +2520,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "tiedostoa %s ei omista mikään paketti\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2661,7 +2704,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(ei ole luku)"
 
@@ -2690,80 +2733,94 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "puuttuva '{' '%{':n jälkeen"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "tyhjä nimiön formaatti"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "tyhjä nimiön nimi"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "tuntematon nimiö"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "']' puuttuu taulukkomäärittelyn lopusta"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "odottamaton ']'"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "odottamaton '}'"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "odotin '}'-merkkiä ilmauksessa"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(tuntematon tyyppi)"
 
@@ -4200,6 +4257,10 @@ msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#, fuzzy
 #~ msgid "New Header signature\n"
 #~ msgstr "en voinut lukea allekirjoitusta"
 
@@ -4247,10 +4308,6 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgstr "tiedostoa %s ei omista mikään paketti\n"
 
 #, fuzzy
-#~ msgid "%s: %-45s YES (db packages)\n"
-#~ msgstr "tiedostoa %s ei omista mikään paketti\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "       rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 #~ "<file>]"
diff --git a/po/fr.po b/po/fr.po
index 6b12f6299..0b02fc39a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-12-12 13:07-0500\n"
+msgstr "POT-Creation-Date: 2000-12-12 16:58-0500\n"
 
 #: build.c:26
 #, fuzzy, c-format
@@ -102,7 +102,7 @@ msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -150,7 +150,7 @@ msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "        -i                - affiche les informations relatives ŕ un package"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -188,7 +188,7 @@ msgstr "        -l                - affiche la liste des packages"
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -311,7 +311,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "   --version\t\t- affiche la version de rpm utilisée"
@@ -330,7 +330,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1275,7 +1275,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1284,14 +1284,35 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr "        -a                - interroge l'ensemble des packages"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
+"        -i                - affiche les informations relatives ŕ un package"
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1307,8 +1328,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1324,20 +1345,22 @@ msgstr "        -a                - interroge l'ensemble des packages"
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "        -a                - interroge l'ensemble des packages"
 
 #: rpmqv.c:353
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
-msgstr ""
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
+msgstr "        -l                - affiche la liste des packages"
 
 #: rpmqv.c:354
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
-msgstr ""
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
+msgstr "        -l                - affiche la liste des packages"
 
 #: rpmqv.c:355
 #, fuzzy, c-format
@@ -1346,18 +1369,21 @@ msgstr "        -l                - affiche la liste des packages"
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1370,9 +1396,14 @@ msgstr ""
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "   --version\t\t- affiche la version de rpm utilisée"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1380,8 +1411,12 @@ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "    -i <packagefile>\t- installe le package"
+msgid "   --macros <file:...>    "
+msgstr "Utilisez de préférence -e ou --erase.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2491,46 +2526,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2669,7 +2709,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2698,80 +2738,94 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 #, fuzzy
 msgid "unexpected ]"
 msgstr "source de requęte inattendue"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 #, fuzzy
 msgid "unexpected }"
 msgstr "source de requęte inattendue"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
@@ -4188,6 +4242,10 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "    -i <packagefile>\t- installe le package"
+
+#, fuzzy
 #~ msgid "New Header signature\n"
 #~ msgstr "      --sign            - genčre une signature PGP"
 
@@ -4368,11 +4426,6 @@ msgstr "impossible d'ouvrir: %s\n"
 #~ msgstr "--oldpackage ne peut ętre spécifié que lors de mises ŕ jour"
 
 #, fuzzy
-#~ msgid ""
-#~ "                        [--provides] [--dump] [--dbpath <dir>] [targets]"
-#~ msgstr "        -a                - interroge l'ensemble des packages"
-
-#, fuzzy
 #~ msgid "   --help\t\t- print this message"
 #~ msgstr "   --help\t\t- affiche ce message"
 
diff --git a/po/gl.po b/po/gl.po
index b6b43ac46..faeb986de 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index b6b43ac46..faeb986de 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index b6b43ac46..faeb986de 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/is.po b/po/is.po
index 9abdfdf22..bd86fb4a6 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 2000-08-02 13:00+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <mappa>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -198,7 +198,7 @@ msgstr "                        skrá1.rpm ... skráN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <mappa>] [--rcfile <skrá>]"
 
@@ -314,7 +314,7 @@ msgstr "skilgreina fjölva <nafn> međ gildinu <gildi>"
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<nafn>+'      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr "prenta útvíkkun fjölva <nafn> á stađalfrálag"
 
@@ -330,7 +330,7 @@ msgstr "senda frálag í <skipun>"
 msgid "    --rcfile <file>       "
 msgstr "    --rcfile <skrá>       "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "nota <skrá> í stađ /etc/rpmrc og $HOME/.rpmrc"
 
@@ -1149,9 +1149,9 @@ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:301
-#, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgstr "       rpm {--rebuilddb} [--rcfile <skrá>] [--dbpath <mappa>]"
 
 #: rpmqv.c:305
 #, c-format
@@ -1159,15 +1159,38 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <skrá>] [--ignorearch] [--dbpath <mappa>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <skrá>]"
+
 #: rpmqv.c:325
-#, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
+"       rpm {--erase -e} [--root <mappa>] [--noscripts] [--rcfile <skrá>]"
+
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr "                        [--scripts] [--root <mappa>] [--rcfile <skrá>]"
 
 #: rpmqv.c:339
-#, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgstr "       rpm {--verify -V -y} [-afpg] [--root <mappa>] [--rcfile <skrá>]"
 
 #: rpmqv.c:343
 #, c-format
@@ -1182,8 +1205,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1195,20 +1218,22 @@ msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] specskrá"
 
 #: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgstr "                        [--rmsource] [--rmspec] specskrá"
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1217,20 +1242,24 @@ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:359
-#, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgstr "       rpm {--resign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
 
 #: rpmqv.c:360
-#, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgstr "       rpm {--addsign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
 
 #: rpmqv.c:361
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
+"       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <skrá>]"
 
 #: rpmqv.c:405
 msgid "  All modes support the following options:"
@@ -1241,15 +1270,26 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
-msgstr ""
+#, fuzzy
+msgid "   --eval '<expr>+'       "
+msgstr "    --eval '<nafn>+'      "
+
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "prenta útvíkkun fjölva <nafn> á stađalfrálag"
 
 #: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+#, fuzzy
+msgid "   --macros <file:...>    "
+msgstr "    --rcfile <skrá>       "
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2309,46 +2349,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2487,7 +2532,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2516,78 +2561,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index b6b43ac46..faeb986de 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index f5ffab1b7..90c68a860 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -88,7 +88,7 @@ msgstr "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
 # build root [BuildRoot]
 # net share [ĽÍĽĂĽČśŚÍ­]
 # reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.121 2000/12/12 20:03:51 jbj Exp $
+# $Id: ja.po,v 1.122 2000/12/12 21:05:50 jbj Exp $
 #: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
@@ -137,7 +137,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -178,7 +178,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -213,7 +213,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -325,7 +325,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
@@ -342,7 +342,7 @@ msgstr "ɸ˝ŕ˝ĐÎϤň <cmd> ¤ŘĽŃĽ¤Ľ×¤ˇ¤Ţ¤š"
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "/etc/rpmrc ¤Č $HOME/.rpmrc ¤ÎÂĺ¤ę¤Ë <file> ¤ňťČÍѤˇ¤Ţ¤š"
 
@@ -1228,7 +1228,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1237,14 +1237,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1260,8 +1277,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1274,19 +1291,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1296,18 +1315,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1320,15 +1342,25 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr ""
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
+
 #: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+#, fuzzy
+msgid "   --macros <file:...>    "
+msgstr "-e ¤Ť --erase ¤ňťČ¤Ă¤Ć¤Ż¤Ŕ¤ľ¤¤\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2435,47 +2467,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s ¤Ď db ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "%s: %s ¤Ď db ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤ČśĽšç¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š: %s\n"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2619,7 +2656,7 @@ msgstr ""
 "žÜşŮ¤ĘžđĘ󤏟čĆŔ¤Ç¤­¤Ţ¤šĄŁ\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
 
@@ -2648,79 +2685,93 @@ msgid "file %s is on an unknown device"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ĎÉÔĚŔ¤ĘĽÇĽĐĽ¤Ľš¤Ç¤š"
 
 #. This should not be allowed
-#: lib/header.c:215
+#: lib/header.c:218
 #, fuzzy
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ĽŤĽŚĽóĽČ¤Ď 1 ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤óĄŁ\n"
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ĽÇĄźĽżĽżĽ¤Ľ× %d ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "headerAddEntry() ¤ÎÉÔŔľ¤ĘĽŤĽŚĽóĽČ: %d\n"
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "% ¤Î¸ĺ¤Ë { ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "%{ ¤Î¸ĺ¤Ë } ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "śő¤ÎĽżĽ°ĽŐĽŠĄźĽŢĽĂĽČ"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "śő¤ÎĽżĽ°Ěž"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "ÉÔĚŔ¤ĘĽżĽ°"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "ÇŰÎó¤Î¸ĺ¤Ë ] ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "Í˝´ü¤ť¤Ě ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "Í˝´ü¤ť¤Ě }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "ź°Ăć¤Ç ? ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr "ź°Ăć¤Ç ? ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "ź°Ăć¤Ë } ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr "°Ę˛ź¤Î ? ĽľĽÖź°¤Î ¤Ë: ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr "ź°Ăć¤Ç : ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "ź°¤Î˝Ş¤ę¤Ë | ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(ÉÔĚŔ¤ĘĽżĽ¤Ľ×)"
 
@@ -4253,10 +4304,6 @@ msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 #~ msgid "%s: %-45s YES (added package)\n"
 #~ msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#, fuzzy
-#~ msgid "%s: %-45s YES (db packages)\n"
-#~ msgstr "%s: %s ¤Ď db ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n"
-
 #~ msgid "package is a version one package!\n"
 #~ msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë¤Ď°ě¤Ä¤ÎĽĐĄźĽ¸ĽçĽó¤ÎĽŃĽĂĽąĄźĽ¸!\n"
 
diff --git a/po/ko.po b/po/ko.po
index b6b43ac46..faeb986de 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/no.po b/po/no.po
index ac2763a42..e8490f152 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 2000-08-17 20:22+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -111,7 +111,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -159,7 +159,7 @@ msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <katalog>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -199,7 +199,7 @@ msgstr "                        fil1.rpm ... filN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <fil>]"
@@ -315,7 +315,7 @@ msgstr "definér makro <navn> med verdi <kropp>"
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<navn>+'      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr "skriv ut utvidelsen av makro <navn> til stdout"
 
@@ -331,7 +331,7 @@ msgstr "send stdout til <kmd>"
 msgid "    --rcfile <file>       "
 msgstr "    --rcfile <fil>        "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "bruk <fil> i stedet for /etc/rpmrc og $HOME/.rpmrc"
 
@@ -1165,9 +1165,9 @@ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:301
-#, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]"
 
 #: rpmqv.c:305
 #, c-format
@@ -1175,15 +1175,40 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <fil>] [--ignorearch] [--dbpath <katalog>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
+
 #: rpmqv.c:325
-#, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+"       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
+
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
+"                        [--scripts] [--root <katalog>] [--rcfile <fil>]"
 
 #: rpmqv.c:339
-#, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
+"       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]"
 
 #: rpmqv.c:343
 #, c-format
@@ -1198,8 +1223,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1211,20 +1236,22 @@ msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] specfil"
 
 #: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgstr "                        [--rmsource] [--rmspec] specfil"
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1233,20 +1260,24 @@ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:359
-#, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgstr "       rpm {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
 #: rpmqv.c:360
-#, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgstr "       rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
 #: rpmqv.c:361
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
+"       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
 #: rpmqv.c:405
 msgid "  All modes support the following options:"
@@ -1257,15 +1288,26 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
-msgstr ""
+#, fuzzy
+msgid "   --eval '<expr>+'       "
+msgstr "    --eval '<navn>+'      "
+
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "skriv ut utvidelsen av makro <navn> til stdout"
 
 #: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+#, fuzzy
+msgid "   --macros <file:...>    "
+msgstr "Bruk -e eller --erase i stedet.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2327,46 +2369,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2505,7 +2552,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2534,78 +2581,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 56695f4ca..93b81f44a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -119,7 +119,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -169,7 +169,7 @@ msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <katalog>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -210,7 +210,7 @@ msgstr "                        plik1.rpm ... plikN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
@@ -334,7 +334,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr "    --pipe <komenda>      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "wyświetl wersję używanego rpm-a"
@@ -352,7 +352,7 @@ msgstr "przekaż standartowe wyjście do <komenda>"
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <plik>     "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "użyj <plik> zamiast /etc/rpmrc i $HOME/.rpmrc"
 
@@ -1208,7 +1208,7 @@ msgstr "       rpm {--initdb}   [--dbpath <katalog>]"
 
 #: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
 
 #: rpmqv.c:305
@@ -1218,15 +1218,38 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <plik>]"
+
 #: rpmqv.c:325
 #, fuzzy, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+"                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
+
 #: rpmqv.c:339
 #, fuzzy, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
 
@@ -1243,8 +1266,8 @@ msgstr "       rpm {--setugids} [-afpg] [cel]"
 #: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile <plik>]"
 
@@ -1259,20 +1282,22 @@ msgstr "                        [--rmsource] plik_spec"
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       rpm {--rmsource} [--rcfile <plik>] [-v] plik_spec"
 
 #: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <plik>] [-v] źródłowy1.rpm ... źródłowyN.rpm"
 
 #: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <plik>] [-v] źródłowy1.rpm ... "
 "źródłowyN.rpm"
@@ -1284,18 +1309,21 @@ msgstr "                        plik1.rpm ... plikN.rpm"
 
 #: rpmqv.c:359
 #, fuzzy, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
 #: rpmqv.c:360
 #, fuzzy, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
 #: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
 
@@ -1310,9 +1338,14 @@ msgstr ""
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "    --pipe <komenda>      "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "wyświetl wersję używanego rpm-a"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1320,8 +1353,12 @@ msgstr "    --pipe <komenda>      "
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "      --rcfile <plik>     "
+msgid "   --macros <file:...>    "
+msgstr "Użyj -e lub --erase\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2439,47 +2476,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "plik %s nie należy do żadnego pakietu\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie należy do żadnego pakietu\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "zależności pakietu %s nie zostały spełnione: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2618,7 +2660,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(nie jest liczbą)"
 
@@ -2647,79 +2689,93 @@ msgid "file %s is on an unknown device"
 msgstr "plik %s jest na nieznanym urządzeniu"
 
 #. This should not be allowed
-#: lib/header.c:215
+#: lib/header.c:218
 #, fuzzy
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi być 1.\n"
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obsługiwany\n"
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Błedny licznik dla headerAddEntry(): %d\n"
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "brak { po %"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "brak } po %{"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "pusty format etykiety"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "pusta nazwa etykiety"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "nieznana etykieta"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "spodziewany ] na końcu tablicy"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "nie spodziewany ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "nie spodziewany }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "spodziewany ? w wyrażeniu"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr "spodziewany { po ? w wyrażeniu"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "spodziewany } w wyrażeniu"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr "spodziewany : po podwyrażeniu ?"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr "spodziewany { po : w wyrażeniu"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "spodziewany | na końcu wyrażenia"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(nieznany typ)"
 
@@ -4124,6 +4180,10 @@ msgstr "nie można otworzyć %s: %s"
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiodło się\n"
 
+#, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "      --rcfile <plik>     "
+
 #~ msgid "sigsize         : %d\n"
 #~ msgstr "rozmiar sygnat. : %d\n"
 
@@ -4209,10 +4269,6 @@ msgstr "utworzenie %s nie powiodło się\n"
 #~ msgid "%s: %-45s YES (added package)\n"
 #~ msgstr "plik %s nie należy do żadnego pakietu\n"
 
-#, fuzzy
-#~ msgid "%s: %-45s YES (db packages)\n"
-#~ msgstr "plik %s nie należy do żadnego pakietu\n"
-
 #~ msgid "package is a version one package!\n"
 #~ msgstr "ten pakiet jest pakietem w wersji jeden!\n"
 
diff --git a/po/pt.po b/po/pt.po
index 81fc602c6..8ac36debf 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 2000-08-01 21:11+01:00\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt <morais@poli.org>\n"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -186,7 +186,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -296,7 +296,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1130,7 +1130,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1139,14 +1139,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1162,8 +1179,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1176,19 +1193,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1198,18 +1217,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1221,7 +1243,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1229,7 +1255,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2289,46 +2319,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2467,7 +2502,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2496,78 +2531,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ce809fc7f..a6afca6ca 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-12-12 13:07-0500\n"
+msgstr "POT-Creation-Date: 2000-12-12 16:58-0500\n"
 
 # , c-format
 #: build.c:26
@@ -122,7 +122,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -172,7 +172,7 @@ msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <diretório>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -218,7 +218,7 @@ msgstr "                        arquivo.rpm ... arquivoN.rpm"
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
@@ -349,7 +349,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "mostra a versăo do programa rpm sendo usado"
@@ -368,7 +368,7 @@ msgstr "envia a saida padrăo para <cmd>"
 msgid "    --rcfile <file>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "use <arquivo> no lugar de /etc/rpmrc e $HOME/.rpmrc"
 
@@ -1285,7 +1285,7 @@ msgstr "       rpm {--initdb}   [--dbpath <diretório>]"
 
 #: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <arquivo>] [--dbpath <diretório>]"
 
 #: rpmqv.c:305
@@ -1294,16 +1294,40 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <arquivo>] [--ignorearch] [--dbpath "
+"<diretório>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <arquivo>]"
+
 #: rpmqv.c:325
 #, fuzzy, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
 "<arquivo>]"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+"                        [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
+
 #: rpmqv.c:339
 #, fuzzy, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
 
@@ -1320,8 +1344,8 @@ msgstr "       rpm {--setugids} [-afpg] [alvo]"
 #: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<arquivo>]"
@@ -1339,21 +1363,23 @@ msgstr ""
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
 #: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
 #: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
@@ -1364,19 +1390,22 @@ msgstr "                        arquivo.rpm ... arquivoN.rpm"
 
 #: rpmqv.c:359
 #, fuzzy, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
 #: rpmqv.c:360
 #, fuzzy, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
 #: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <arquivo>]"
 
 #: rpmqv.c:405
@@ -1390,9 +1419,14 @@ msgstr ""
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "    -b<estágio> <spec>    "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "mostra a versăo do programa rpm sendo usado"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1400,8 +1434,12 @@ msgstr "    -b<estágio> <spec>    "
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "    -b<estágio> <spec>    "
+msgid "   --macros <file:...>    "
+msgstr "Use -e ou --erase no lugar.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2560,46 +2598,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "năo foi passado pacote para instalaçăo"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "năo foi passado pacote para desinstalaçăo"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2739,7 +2782,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2770,80 +2813,94 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 #, fuzzy
 msgid "unexpected ]"
 msgstr "fonte de pesquisa năo esperado"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 #, fuzzy
 msgid "unexpected }"
 msgstr "fonte de pesquisa năo esperado"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
@@ -4319,6 +4376,10 @@ msgid "failed to create %s: %s\n"
 msgstr "Năo consegui abrir o pipe tar: %s\n"
 
 #, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
 #~ msgid "New Header signature\n"
 #~ msgstr "gere assinatura PGP"
 
diff --git a/po/ro.po b/po/ro.po
index 4ca9ff22b..c13b692b5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -149,7 +149,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -184,7 +184,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -310,7 +310,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1128,7 +1128,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1137,14 +1137,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1160,8 +1177,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1174,19 +1191,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1196,18 +1215,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1219,7 +1241,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1227,7 +1253,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2287,46 +2317,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2465,7 +2500,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2494,78 +2529,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/rpm.pot b/po/rpm.pot
index cf7cc99ba..09ab484fd 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-12-12 14:32-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2322,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 50f6a42e9..dae1789d4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 2000-08-08 01:20+0300\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -111,7 +111,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -160,7 +160,7 @@ msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <ËÁÔÁĚĎÇ>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -199,7 +199,7 @@ msgstr "                        file1.rpm ... fileN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <ËÁÔÁĚĎÇ>] [--rcfile <ĆÁĘĚ>]"
@@ -314,7 +314,7 @@ msgstr "ĎĐŇĹÄĹĚÉÔŘ ÍÁËŇĎÓ <ÉÍŃ> ÓĎ ÚÎÁŢĹÎÉĹÍ <ĐĎÄÓÔÁÎĎ×ËÁ>"
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<name>+'      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr "×Ů×ĹÓÔÉ ÚÎÁŢĹÎÉĹ ÍÁËŇĎÓÁ <ÉÍŃ>"
 
@@ -330,7 +330,7 @@ msgstr "ĐĎÓĚÁÔŘ ÓÔÁÎÄÁŇÔÎŮĘ ×Ů×ĎÄ × <cmd>"
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <ĆÁĘĚ>     "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ> ×ÍĹÓÔĎ /etc/rpmrc É $HOME/.rpmrc"
 
@@ -1187,8 +1187,8 @@ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <ËÁÔÁĚĎÇ>]\n"
 
 #: rpmqv.c:301
-#, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+#, fuzzy, c-format
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <ĆÁĘĚ>] [--dbpath <ËÁÔÁĚĎÇ>]\n"
 
 #: rpmqv.c:305
@@ -1198,15 +1198,38 @@ msgid ""
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <file>] [--ignorearch] [--dbpath <ËÁÔÁĚĎÇ>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <ĆÁĘĚ>]"
+
 #: rpmqv.c:325
-#, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <ËÁÔÁĚĎÇ>] [--noscripts] [--rcfile <ĆÁĘĚ>]\n"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+"                        [--scripts] [--root <ËÁÔÁĚĎÇ>] [--rcfile <ĆÁĘĚ>]"
+
 #: rpmqv.c:339
-#, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <ËÁÔÁĚĎÇ>] [--rcfile <ĆÁĘĚ>]\n"
 
@@ -1221,10 +1244,10 @@ msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [ĂĹĚŘ]\n"
 
 #: rpmqv.c:348
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<ĆÁĘĚ>]\n"
@@ -1238,21 +1261,23 @@ msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] specfile"
 
 #: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+#, fuzzy, c-format
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <ĆÁĘĚ>] [-v] specfile\n"
 
 #: rpmqv.c:353
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <ĆÁĘĚ>] [-v] source1.rpm ... sourceN.rpm\n"
 
 #: rpmqv.c:354
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <ĆÁĘĚ>] [-v] source1.rpm ... sourceN.rpm\n"
 
@@ -1262,19 +1287,22 @@ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "       %s {--freshen -F} ĆÁĘĚ1.rpm ... ĆÁĘĚN.rpm\n"
 
 #: rpmqv.c:359
-#, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <ĆÁĘĚ>] ĐÁËĹÔ1 ĐÁËĹÔ2 ... ĐÁËĹÔN\n"
 
 #: rpmqv.c:360
-#, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+#, fuzzy, c-format
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       %s {--addsign} [--rcfile <ĆÁĘĚ>] ĐÁËĹÔ1 ĐÁËĹÔ2 ... ĐÁËĹÔN"
 
 #: rpmqv.c:361
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <ĆÁĘĚ>]\n"
 
@@ -1287,16 +1315,27 @@ msgid "   --define '<name> <body>'"
 msgstr "   --define '<ÉÍŃ> <ĐĎÄÓÔÁÎĎ×ËÁ>'"
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+#, fuzzy
+msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<ÉÍŃ>+'       "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "×Ů×ĹÓÔÉ ÚÎÁŢĹÎÉĹ ÍÁËŇĎÓÁ <ÉÍŃ>"
+
 #: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <ËĎÍÁÎÄÁ>      "
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
-msgstr "      --rcfile <ĆÁĘĚ>     "
+#, fuzzy
+msgid "   --macros <file:...>    "
+msgstr "÷ÍĹÓÔĎ ÎÉČ ÉÓĐĎĚŘÚŐĘÔĹ -e ÉĚÉ --erase.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 msgid "   --dbpath <dir>         "
@@ -2364,47 +2403,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s YES (db provides)\n"
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "%s: %-45s YES (db files)\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NO\n"
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÄĎÂÁ×ĚĹÎĎ × ËĹŰ ÚÁ×ÉÓÉÍĎÓÔĹĘ\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s-%s-%s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ĐÁËĹÔ %s ËĎÎĆĚÉËÔŐĹÔ Ó: %s\n"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s.\n"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2548,7 +2592,7 @@ msgstr ""
 "ŇÁÓÓŮĚËÉ rpm-list@redhat.com\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(ÎĹ ŢÉÓĚĎ)"
 
@@ -2577,79 +2621,93 @@ msgid "file %s is on an unknown device"
 msgstr "ĆÁĘĚ %s - ÎÁ ÎĹÉÚ×ĹÓÔÎĎÍ ŐÓÔŇĎĘÓÔ×Ĺ"
 
 #. This should not be allowed
-#: lib/header.c:215
+#: lib/header.c:218
 #, fuzzy
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE count must be 1.\n"
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉĐ ÄÁÎÎŮČ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "îĹ×ĹŇÎĎĹ ŢÉÓĚĎ ÄĚŃ headerAddEntry(): %d\n"
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"{\" ĐĎÓĚĹ \"%\""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"}\" ĐĎÓĚĹ \"%{\""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "ĐŐÓÔĎĘ ĆĎŇÍÁÔ ÔÜÇÁ"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "ĐŐÓÔĎĹ ÉÍŃ ÔÜÇÁ"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "× ËĎÎĂĹ ÍÁÓÓÉ×Á ĎÖÉÄÁĚÁÓŘ \"]\""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"]\""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"}\""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"?\""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \"{\""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"}\""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \":\""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \":\" ĎÖÉÄÁĚĎÓŘ \"{\""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(ÎĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ)"
 
@@ -4055,6 +4113,9 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
 
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "      --rcfile <ĆÁĘĚ>     "
+
 #~ msgid "sigsize         : %d\n"
 #~ msgstr "ŇÁÚÍĹŇ ĐĎÄĐÉÓÉ  : %d\n"
 
diff --git a/po/sk.po b/po/sk.po
index 2fbf0d202..be421ffa1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -114,7 +114,7 @@ msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 "                           [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -165,7 +165,7 @@ msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                           [--oldpackage] [--root <adresár>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -206,7 +206,7 @@ msgstr "                           súbor1.rpm ... súborN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                           [--scripts] [--root <adresár>] [--rcfile <súbor>]"
@@ -336,7 +336,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr "    --pipe <príkaz>       "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "vypísať verziu používaného rpm"
@@ -354,7 +354,7 @@ msgstr "poslať štandardný výstup do <príkazu>"
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <file>     "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "použiť <súbor> namiesto /etc/rpmrc a $HOME/.rpmrc"
 
@@ -1215,7 +1215,7 @@ msgstr "          rpm {--initdb}   [--dbpath <adresár>]"
 
 #: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "          rpm {--rebuilddb} [--rcfile <súbor>] [--dbpath <adresár>]"
 
 #: rpmqv.c:305
@@ -1225,16 +1225,40 @@ msgid ""
 msgstr ""
 "          rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                           [--rcfile <súbor>] [--ignorearch] [--dbpath "
+"<adresár>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                           [--excludedocs] [--includedocs] [--rcfile <súbor>]"
+
 #: rpmqv.c:325
 #, fuzzy, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "          rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
 "<súbor>]"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+"                           [--scripts] [--root <adresár>] [--rcfile <súbor>]"
+
 #: rpmqv.c:339
 #, fuzzy, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "          rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
 
@@ -1251,8 +1275,8 @@ msgstr "          rpm {--setugids} [-afpg] [cieľ]"
 #: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "          rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<súbor>]"
@@ -1268,20 +1292,22 @@ msgstr "                           [--rmsource] specsúbor"
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "          rpm {--rmsource} [--rcfile <súbor>] [-v] specsúbor"
 
 #: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "          rpm {--rebuild}  [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
 
 #: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "          rpm {--recompile} [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
 
@@ -1292,18 +1318,21 @@ msgstr "                           súbor1.rpm ... súborN.rpm"
 
 #: rpmqv.c:359
 #, fuzzy, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "          rpm {--resign}   [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
 #: rpmqv.c:360
 #, fuzzy, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "          rpm {--addsign}  [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
 #: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 "          rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<súbor>]"
@@ -1319,9 +1348,14 @@ msgstr ""
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "    --pipe <príkaz>       "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "vypísať verziu používaného rpm"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1329,8 +1363,12 @@ msgstr "    --pipe <príkaz>       "
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "      --rcfile <file>     "
+msgid "   --macros <file:...>    "
+msgstr "Namiesto nich použite -e alebo --erase.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2446,47 +2484,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "požiadavka balíka %s nie je uspokojená: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraňuje sa index skupín\n"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2625,7 +2668,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(nie je číslo)"
 
@@ -2654,79 +2697,93 @@ msgid "file %s is on an unknown device"
 msgstr "súbor %s sa nachádza na neznámom zariadení"
 
 #. This should not be allowed
-#: lib/header.c:215
+#: lib/header.c:218
 #, fuzzy
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE počet musí byť 1.\n"
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovaný\n"
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Chybný počet pre headerAddEntry(): %d\n"
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "chýbajúce { po %"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "chýbajúce } po %{"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "prázdny tag formát"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "prázdne meno tagu"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "neznámy tag"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "] očakávané na konci poľa"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "neočakávané ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "neočakávané }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "? očakávané vo výraze"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr "{ očakávané po ? vo výraze"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "} očakávané vo výraze"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ": očakávané po ? podvýraze"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr "{ očakávané po : vo výraze"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "| očakávené na konci výrazu"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(neznámy typ)"
 
@@ -4131,6 +4188,10 @@ msgstr "nepodarilo sa otvoriť %s: %s"
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvoriť %s\n"
 
+#, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "      --rcfile <file>     "
+
 #~ msgid "sigsize         : %d\n"
 #~ msgstr "veľkosť podpisu  : %d\n"
 
@@ -4220,10 +4281,6 @@ msgstr "nepodarilo sa vytvoriť %s\n"
 #~ msgid "%s: %-45s YES (added package)\n"
 #~ msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
 
-#, fuzzy
-#~ msgid "%s: %-45s YES (db packages)\n"
-#~ msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
-
 #~ msgid "package is a version one package!\n"
 #~ msgstr "balík je verzie jedna!\n"
 
diff --git a/po/sl.po b/po/sl.po
index e22484fd9..3c896372f 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.106 2000/12/12 20:03:59 jbj Exp $
+# $Id: sl.po,v 1.107 2000/12/12 21:05:51 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -116,7 +116,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -166,7 +166,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <imenik>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -206,7 +206,7 @@ msgstr "                        datoteka1.rpm ... datotekaN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
@@ -329,7 +329,7 @@ msgstr "definirajte makro <ime> z vrednostjo <telo>"
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<ime>+'      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr "standardni izhod preusmerjen na <ukaz>"
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <datoteka> "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "uporabite <datoteka> namesto /etc/rpmrc in $HOME/.rpmrc"
 
@@ -1199,7 +1199,7 @@ msgstr "       %s {--initdb}   [--dbpath <imenik>]\n"
 
 #: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]\n"
 
 #: rpmqv.c:305
@@ -1209,16 +1209,40 @@ msgid ""
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <datoteka>] [--ignorearch] [--dbpath "
+"<imenik>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <datoteka>]"
+
 #: rpmqv.c:325
 #, fuzzy, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <imenik>] [--noscripts] [--rcfile "
 "<datoteka>]\n"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+"                        [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
+
 #: rpmqv.c:339
 #, fuzzy, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]\n"
 
@@ -1235,8 +1259,8 @@ msgstr "       %s {--setugids} [-afpg] [target]\n"
 #: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
 "<datoteka>]\n"
@@ -1251,20 +1275,22 @@ msgstr "                        [--rmsource] [--rmspec] datoteka_spec"
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <datoteka>] [-v] datoteka_spec\n"
 
 #: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm\n"
 
 #: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <datoteka>] [-v] izvor1.rpm ... "
 "izvorN.rpm\n"
@@ -1276,18 +1302,21 @@ msgstr "       %s {--freshen -F} datoteka1.rpm ... datotekaN.rpm\n"
 
 #: rpmqv.c:359
 #, fuzzy, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN\n"
 
 #: rpmqv.c:360
 #, fuzzy, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       %s {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
 #: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<datoteka>]\n"
@@ -1303,9 +1332,14 @@ msgstr "   --define '<ime> <telo>'"
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<ime>+'       "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "uporabljana različica rpm"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1313,8 +1347,12 @@ msgstr "   --pipe <ukaz>         "
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "   --rcfile <datoteka> "
+msgid "   --macros <file:...>    "
+msgstr "Namesto njiju uporabite -e ali --erase.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2430,47 +2468,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "%s: %s zadovoljen ob paketih db.\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s jw v sporu z: %s\n"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2615,7 +2658,7 @@ msgstr ""
 "na strani http://www.rpm.org ali po dopisni listi rpm-list@redhat.com.\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(ni število)"
 
@@ -2644,79 +2687,93 @@ msgid "file %s is on an unknown device"
 msgstr "datoteka %s se nahaja na neznani napravi"
 
 #. This should not be allowed
-#: lib/header.c:215
+#: lib/header.c:218
 #, fuzzy
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "števec grabData() RPM_STRING_TYPE mora biti 1.\n"
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Nepravilno stanje števca za headerAddEntry(): %d\n"
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "manjkajoči { za %"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "manjkajoči } za %{"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "oblika značke manjka"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "ime značke manjka"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "neznana značka"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "na koncu polja je pričakovan ]"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "nepričakovan ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "nepričakovan }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "v izrazu je pričakovan ?"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr "v izrazu je za { pričakovan ?"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "v izrazu je pričakovan }"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr "za podizrazom ? je pričakovano :"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr "v izrazu je za : pričakovan {"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "na koncu izraza je pričakovan |"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(neznan tip)"
 
@@ -4138,6 +4195,10 @@ msgstr "neuspešno odpiranje %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspešno ustvarjanje %s: %s\n"
 
+#, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "   --rcfile <datoteka> "
+
 #~ msgid "undefined identifier"
 #~ msgstr "nedefiniran identifikator"
 
@@ -4223,10 +4284,6 @@ msgstr "neuspešno ustvarjanje %s: %s\n"
 #~ msgid "%s: %-45s YES (added package)\n"
 #~ msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
 
-#, fuzzy
-#~ msgid "%s: %-45s YES (db packages)\n"
-#~ msgstr "%s: %s zadovoljen ob paketih db.\n"
-
 #~ msgid "package is a version one package!\n"
 #~ msgstr "paket je paket različica ena!\n"
 
diff --git a/po/sr.po b/po/sr.po
index bf2fb16ab..5fc83232d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -153,7 +153,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -191,7 +191,7 @@ msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -310,7 +310,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "napiši verziju rpm-a koja se koristi"
@@ -329,7 +329,7 @@ msgstr "pošalji standardni izlaz u <komandu>"
 msgid "    --rcfile <file>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "koristi <datoteku> umesto /etc/rpmrc i $HOME/.rpmrc"
 
@@ -1216,9 +1216,9 @@ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "    -b<faza> <spec>\t "
 
 #: rpmqv.c:301
-#, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgstr "    -b<faza> <spec>\t "
 
 #: rpmqv.c:305
 #, c-format
@@ -1226,14 +1226,34 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr "\t\t\t   paket1 ...paketN"
+
 #: rpmqv.c:325
 #, fuzzy, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
+
 #: rpmqv.c:339
 #, fuzzy, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
 #: rpmqv.c:343
@@ -1249,8 +1269,8 @@ msgstr ""
 #: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
 #: rpmqv.c:350
@@ -1265,19 +1285,21 @@ msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
 #: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
 #: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
 #: rpmqv.c:355
@@ -1287,18 +1309,21 @@ msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
 #: rpmqv.c:359
 #, fuzzy, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
 #: rpmqv.c:360
 #, fuzzy, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "\trpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
 #: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
 #: rpmqv.c:405
@@ -1312,9 +1337,14 @@ msgstr ""
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "    -b<faza> <spec>\t "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "napiši verziju rpm-a koja se koristi"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1322,8 +1352,12 @@ msgstr "    -b<faza> <spec>\t "
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "    -b<faza> <spec>\t "
+msgid "   --macros <file:...>    "
+msgstr "Koristite -e ili --erase.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2443,47 +2477,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "datoteka %s ne pripada nijednom paketu\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2622,7 +2661,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(nije broj)"
 
@@ -2651,80 +2690,94 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "nedostaje { posle %"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "nedostaje } posle %"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "prazan 'tag' format'"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "prazno ime tag-a"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "nepoznat tag"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "] očekivano na kraju niza"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "neočekivano ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "neočekivano }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "očekivan znak ? u izrazu"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ očekivano posle ? u izrazu"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "} očekivano u izrazu"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr "očekivano : praćeno ? podizrazom"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ očekivano posle : u izrazu"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "| očekivano na kraju izraza"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(nepoznat tip)"
 
@@ -4159,6 +4212,10 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#, fuzzy
 #~ msgid "New Header signature\n"
 #~ msgstr "ne mogu da pročitam potpis"
 
@@ -4199,10 +4256,6 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgstr "datoteka %s ne pripada nijednom paketu\n"
 
 #, fuzzy
-#~ msgid "%s: %-45s YES (db packages)\n"
-#~ msgstr "datoteka %s ne pripada nijednom paketu\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "       rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 #~ "<file>]"
diff --git a/po/sv.po b/po/sv.po
index 767e634e6..b7f113ddd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: 2000-10-09 22:31+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -155,7 +155,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <kat>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -194,7 +194,7 @@ msgstr "                        fil1.rpm ... filN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
@@ -306,7 +306,7 @@ msgstr "definiera makrot <namn> som <kropp>"
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<namn>+'      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr "skriv ut expansionen av makrot <namn> pĺ standard ut"
 
@@ -322,7 +322,7 @@ msgstr "skicka stdut till <kommando>"
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <fil>      "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "använd <fil> istället för /etc/rpmrc och $HOME/.rpmrc"
 
@@ -1169,8 +1169,8 @@ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <kat>]\n"
 
 #: rpmqv.c:301
-#, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+#, fuzzy, c-format
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]\n"
 
 #: rpmqv.c:305
@@ -1180,14 +1180,36 @@ msgid ""
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
+
 #: rpmqv.c:325
-#, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr "       %s {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]\n"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
+
 #: rpmqv.c:339
-#, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr "       %s {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]\n"
 
 #: rpmqv.c:343
@@ -1201,10 +1223,10 @@ msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [mĺl]\n"
 
 #: rpmqv.c:348
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile <fil>]\n"
 
@@ -1217,21 +1239,23 @@ msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] spec-fil"
 
 #: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+#, fuzzy, c-format
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <fil>] [-v] spec-fil\n"
 
 #: rpmqv.c:353
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
 
 #: rpmqv.c:354
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
 
@@ -1241,19 +1265,22 @@ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "       %s {--freshen -F} fil1.rpm ... filN.rpm\n"
 
 #: rpmqv.c:359
-#, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+#, fuzzy, c-format
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <fil>] paket1 paket2 ... paketN\n"
 
 #: rpmqv.c:360
-#, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+#, fuzzy, c-format
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       %s {--addsign} [--rcfile <fil>] paket1 paket2 ... paketN"
 
 #: rpmqv.c:361
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]\n"
 
@@ -1266,16 +1293,27 @@ msgid "   --define '<name> <body>'"
 msgstr "   --define '<namn> <kropp>'"
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+#, fuzzy
+msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<namn>+'       "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "skriv ut expansionen av makrot <namn> pĺ standard ut"
+
 #: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr "   --pipe <kommando>      "
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
-msgstr "   --rcfile <fil>         "
+#, fuzzy
+msgid "   --macros <file:...>    "
+msgstr "Använd -e eller --erase istället.\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 msgid "   --dbpath <dir>         "
@@ -2339,47 +2377,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tillhandahĺllande)\n"
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "%s: %-45s JA (db-filer)\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s stĺr i konflikt: %s\n"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tar bort \"%s\" frĺn %s-indexet.\n"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2523,7 +2566,7 @@ msgstr ""
 "problemet.\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(inte ett tal)"
 
@@ -2552,79 +2595,93 @@ msgid "file %s is on an unknown device"
 msgstr "filen %s är pĺ en okänd enhet"
 
 #. This should not be allowed
-#: lib/header.c:215
+#: lib/header.c:218
 #, fuzzy
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE mĺste vara 1.\n"
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Felaktigt antal till headerAddEntry(): %d\n"
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "{ fattas efter %"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "} fattas efter %{"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "tomt taggformat"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "tomt taggnamn"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "okänd tagg"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "] förväntades vid slutet pĺ vektor"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "oväntad ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "oväntad }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "? förväntades i uttryck"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr "{ förväntades efter ? i uttryck"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "} förväntades i uttryck"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ": förväntades efter ? i deluttryck"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr "{ förväntades efter : i uttryck"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "| förväntades vid slutet pĺ uttryck"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(okänd typ)"
 
@@ -4028,6 +4085,9 @@ msgstr "kunde inte öppna %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "   --rcfile <fil>         "
+
 #~ msgid "sigsize         : %d\n"
 #~ msgstr "sigstorlek       : %d\n"
 
diff --git a/po/tr.po b/po/tr.po
index 4c374b1d4..a259a2468 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -131,7 +131,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <dizin>] [--noscripts]"
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -222,7 +222,7 @@ msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 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:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <dizin>] [--rcfile <dosya>]"
@@ -348,7 +348,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "Kullanýlan RPM sürümünü verir"
@@ -367,7 +367,7 @@ msgstr "standart çýktýyý <KOMUT>'a gönderir"
 msgid "    --rcfile <file>       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "/etc/rpmrc ve $HOME/.rpmrc yerine <dosya> kullanýn"
 
@@ -1256,7 +1256,7 @@ msgstr "       rpm {--initdb}   [--dbpath <dizin>]"
 
 #: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <dosya>] [--dbpath <dizin>]"
 
 #: rpmqv.c:305
@@ -1266,15 +1266,38 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
+#: rpmqv.c:308
+#, fuzzy
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+"                        [--rcfile <dosya>] [--ignorearch] [--dbpath <dizin>]"
+
+#: rpmqv.c:317
+#, fuzzy
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+"                        [--excludedocs] [--includedocs] [--rcfile <dosya>]"
+
 #: rpmqv.c:325
 #, fuzzy, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
 
+#: rpmqv.c:332
+#, fuzzy
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+"                        [--scripts] [--root <dizin>] [--rcfile <dosya>]"
+
 #: rpmqv.c:339
 #, fuzzy, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
 
@@ -1291,8 +1314,8 @@ msgstr "       rpm {--setugids} [-afpg] [target]"
 #: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<dosya>]"
@@ -1310,20 +1333,22 @@ msgstr ""
 
 #: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr "       rpm {--rmsource} [--rcfile <dosya>] [-v] specdosyasý"
 
 #: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
 
 #: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
 
@@ -1334,18 +1359,21 @@ msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
 #: rpmqv.c:359
 #, fuzzy, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
 #: rpmqv.c:360
 #, fuzzy, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
 #: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <dosya>]"
 
 #: rpmqv.c:405
@@ -1359,9 +1387,14 @@ msgstr ""
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
 msgstr "    -b<adým> <spec>      "
 
+#: rpmqv.c:409
+#, fuzzy
+msgid "print the expansion of macro <expr> to stdout"
+msgstr "Kullanýlan RPM sürümünü verir"
+
 #: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
@@ -1369,8 +1402,12 @@ msgstr "    -b<adým> <spec>      "
 
 #: rpmqv.c:412
 #, fuzzy
-msgid "   --rcfile <file>        "
-msgstr "    -b<adým> <spec>      "
+msgid "   --macros <file:...>    "
+msgstr "Yerine  -e veya --erase komutunu kullanýn\n"
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
+msgstr ""
 
 #: rpmqv.c:417
 #, fuzzy
@@ -2492,47 +2529,52 @@ msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
 #: lib/depends.c:1143
+#, fuzzy, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
+
+#: lib/depends.c:1159
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2671,7 +2713,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr "(üye deđil)"
 
@@ -2700,80 +2742,94 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr "% den sonra eksik {"
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr "%{ den sonra eksik }"
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr "boţ tag tanýmlamasý"
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr "boţ tag ismi"
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr "bilinmeyen tag"
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr "dizinin sonunda ] bekleniyordu"
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr "beklenmeyen ]"
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr "beklenmeyen }"
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "dizi içerisinde ? den sonra { bekleniyordu"
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr "dizi içerisinde } bekleniyordu"
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr "? altdizisinden sonra : bekleniyordu"
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "dizide : den sonra { bekleniyordu"
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr "dizinin sonunda | bekleniyordu"
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr "(bilinmeyen tip)"
 
@@ -4212,6 +4268,10 @@ msgid "failed to create %s: %s\n"
 msgstr "%s yaratýlamýyor\n"
 
 #, fuzzy
+#~ msgid "   --rcfile <file>        "
+#~ msgstr "    -b<adým> <spec>      "
+
+#, fuzzy
 #~ msgid "New Header signature\n"
 #~ msgstr "imzayý okumak mümkün olmadý"
 
@@ -4259,10 +4319,6 @@ msgstr "%s yaratýlamýyor\n"
 #~ msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
 
 #, fuzzy
-#~ msgid "%s: %-45s YES (db packages)\n"
-#~ msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "       rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 #~ "<file>]"
diff --git a/po/uk.po b/po/uk.po
index b6b43ac46..faeb986de 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/wa.po b/po/wa.po
index b6b43ac46..faeb986de 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/zh.po b/po/zh.po
index b6b43ac46..faeb986de 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index b6b43ac46..faeb986de 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"POT-Creation-Date: 2000-12-12 16:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:308
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
@@ -154,7 +154,7 @@ msgstr ""
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:317
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
@@ -189,7 +189,7 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:332
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:409
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -315,7 +315,7 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:413
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
 #: rpmqv.c:305
@@ -1142,14 +1142,31 @@ msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
+#: rpmqv.c:308
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:317
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
 #: rpmqv.c:325
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgstr ""
+
+#: rpmqv.c:332
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
 #: rpmqv.c:339
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:343
@@ -1165,8 +1182,8 @@ msgstr ""
 #: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<file>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:350
@@ -1179,19 +1196,21 @@ msgstr ""
 
 #: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
 #: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+"sourceN.rpm\n"
 msgstr ""
 
 #: rpmqv.c:355
@@ -1201,18 +1220,21 @@ msgstr ""
 
 #: rpmqv.c:359
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
 #: rpmqv.c:360
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
 #: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
 #: rpmqv.c:405
@@ -1224,7 +1246,11 @@ msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --eval '<name>+'       "
+msgid "   --eval '<expr>+'       "
+msgstr ""
+
+#: rpmqv.c:409
+msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
 #: rpmqv.c:410
@@ -1232,7 +1258,11 @@ msgid "   --pipe <cmd>           "
 msgstr ""
 
 #: rpmqv.c:412
-msgid "   --rcfile <file>        "
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:413
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
 #: rpmqv.c:417
@@ -2292,46 +2322,51 @@ msgstr ""
 
 #: lib/depends.c:1143
 #, c-format
+msgid "%s: %-45s YES (db package)\n"
+msgstr ""
+
+#: lib/depends.c:1159
+#, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1164
+#: lib/depends.c:1180
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1222
+#: lib/depends.c:1238
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1289
+#: lib/depends.c:1305
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1515
+#: lib/depends.c:1531
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1619
+#: lib/depends.c:1635
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1669
+#: lib/depends.c:1685
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1772
+#: lib/depends.c:1788
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1803
+#: lib/depends.c:1819
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2470,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2499,78 +2534,92 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
-msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
+#: lib/header.c:218
+msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:246 lib/header.c:717 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1074
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1481
+#. @-observertrans@
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1509
+#. @-observertrans@
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1521
+#. @-observertrans@
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1531
+#. @-observertrans@
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1546
+#. @-observertrans@
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1571
+#. @-observertrans@
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1587
+#. @-observertrans@
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1589
+#. @-observertrans@
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1644
+#. @-observertrans@
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1651
+#. @-observertrans@
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1662 lib/header.c:1697
+#. @-observertrans@
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1670
+#. @-observertrans@
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1684
+#. @-observertrans@
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1705
+#. @-observertrans@
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1870
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/popt/po/cs.po b/popt/po/cs.po
index 77c532fbf..f3cdb8e4e 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/popt/po/da.po b/popt/po/da.po
index 13c863877..f56364612 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/popt/po/de.po b/popt/po/de.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/es.po b/popt/po/es.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/fi.po b/popt/po/fi.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/fr.po b/popt/po/fr.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/gl.po b/popt/po/gl.po
index dd2b14a7a..0e4a0debf 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index f7117ba64..10d253774 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/popt/po/id.po b/popt/po/id.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/is.po b/popt/po/is.po
index 1fe522942..7a9e5ecd9 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/popt/po/it.po b/popt/po/it.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/ja.po b/popt/po/ja.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/ko.po b/popt/po/ko.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/no.po b/popt/po/no.po
index 84a4cf9b4..c2cc10338 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/pt.po b/popt/po/pt.po
index c6ae4f25f..1ec498595 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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 c6cec5b59..52689c8c2 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index fa1e91c73..9d9e5c7a1 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index a3b29ae61..95e9897f8 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/sl.po b/popt/po/sl.po
index 7330b89d6..fd7562aac 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/popt/po/sr.po b/popt/po/sr.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/sv.po b/popt/po/sv.po
index e27bcff22..e7c204501 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index 2b144bf46..1da4d826a 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Görkem Çetin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.Ţ <gorkem@gelecek.com.tr>\n"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 41d49b0b8..7f0b59ec5 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/popt/po/wa.po b/popt/po/wa.po
index e0c3f4e68..57fa27284 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/popt/po/zh.po b/popt/po/zh.po
index 1d906ea76..6204394ed 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-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/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index 523cea625..9db6ad6ce 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 6db5448a1..83632d273 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -622,14 +622,22 @@ static PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args) {
 
 
 static PyObject * hdrLoad(PyObject * self, PyObject * args) {
-    char * obj;
+    char * obj, * copy=NULL;
     Header hdr;
     hdrObject * h;
     int len;
 
     if (!PyArg_ParseTuple(args, "s#", &obj, &len)) return NULL;
+    
+    copy = malloc(len);
+    if (copy == NULL) {
+	PyErr_SetString(pyrpmError, "out of memory");
+	return NULL;
+    }
+
+    memcpy (copy, obj, len);
 
-    hdr = headerLoad(obj);
+    hdr = headerLoad(copy);
     if (!hdr) {
 	PyErr_SetString(pyrpmError, "bad header");
 	return NULL;
diff --git a/rpm.spec b/rpm.spec
index 72c2b9fba..4ebf8281b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,8 @@
 %define	with_python_subpackage	1
 %define	with_bzip2		1
 %define	with_apidocs		1
+%define strip_binaries		0
+%define	__spec_install_post	:
 
 # XXX legacy requires './' payload prefix to be omitted from rpm packages.
 %define	_noPayloadPrefix	1
@@ -10,15 +12,15 @@
 
 Summary: The Red Hat package management system.
 Name: rpm
-%define version 4.1
+%define version 4.0.2
 Version: %{version}
-Release: 0.15
+Release: 0.1
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
 Conflicts: patch < 2.5
 %ifos linux
-Prereq: gawk fileutils textutils sh-utils mktemp
+Prereq: gawk fileutils textutils mktemp
 Requires: popt
 %endif
 
@@ -128,14 +130,19 @@ make DESTDIR="$RPM_BUILD_ROOT" install
 
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
 cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.db1
-%_dbpath		1
-%_dbpath_rebuild	1
+%%_dbapi		1
 E_O_F
 
+%if %{strip_binaries}
 { cd $RPM_BUILD_ROOT
   strip ./bin/rpm
   strip .%{__prefix}/bin/rpm2cpio
 }
+%endif
+
+%if %{with_apidocs}
+gzip -9n apidocs/man/* || :
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,13 +161,16 @@ fi
 %post
 %ifos linux
 /sbin/ldconfig
-if [ ! -e /etc/rpm/macros -a -e /etc/rpmrc -a -f %{__prefix}/lib/rpm/convertrpmrc.sh ]; then
-	sh %{__prefix}/lib/rpm/convertrpmrc.sh > /dev/null 2>&1
-fi
 %endif
-/bin/rpm --initdb
-if [ -f /var/lib/rpm/Packages]; then
+if [ -f /var/lib/rpm/packages.rpm ]; then
+    : # do nothing
+elif [ -f /var/lib/rpm/Packages ]; then
+    # undo db1 configuration
+    rm -f /etc/rpm/macros.db1
+else
+    # initialize db3 database
     rm -f /etc/rpm/macros.db1
+    /bin/rpm --initdb
 fi
 
 %ifos linux
@@ -224,13 +234,6 @@ fi
 %{__prefix}/lib/rpm/armv[34][lb]*
 %endif
 
-%dir %{__prefix}/src/redhat
-%dir %{__prefix}/src/redhat/BUILD
-%dir %{__prefix}/src/redhat/SPECS
-%dir %{__prefix}/src/redhat/SOURCES
-%dir %{__prefix}/src/redhat/SRPMS
-%dir %{__prefix}/src/redhat/RPMS
-%{__prefix}/src/redhat/RPMS/*
 %{__prefix}/*/locale/*/LC_MESSAGES/rpm.mo
 %{__prefix}%{__share}/man/man[18]/*.[18]*
 %lang(pl) %{__prefix}%{__share}/man/pl/man[18]/*.[18]*
@@ -239,6 +242,13 @@ fi
 
 %files build
 %defattr(-,root,root)
+%dir %{__prefix}/src/redhat
+%dir %{__prefix}/src/redhat/BUILD
+%dir %{__prefix}/src/redhat/SPECS
+%dir %{__prefix}/src/redhat/SOURCES
+%dir %{__prefix}/src/redhat/SRPMS
+%dir %{__prefix}/src/redhat/RPMS
+%{__prefix}/src/redhat/RPMS/*
 %{__prefix}/bin/rpmbuild
 %{__prefix}/lib/rpm/brp-*
 %{__prefix}/lib/rpm/check-prereqs
@@ -300,13 +310,34 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
-* Sun Dec  3 2000 Jeff Johnson <jbj@redhat.com>
+* Tue Dec 12 2000 Jeff Johnson <jbj@redhat.com>
+- bail on header regions.
+
+* Sun Dec 10 2000 Jeff Johnson <jbj@redhat.com>
+- handle added dirtoken tags (mostly) correctly with header regions.
+- add FHS doc/man/info dirs, diddle autoconf goo.
+- fix: headerUnload handles headers w/o regions correctly on rebuilddb.
+
+* Thu Dec  7 2000 Jeff Johnson <jbj@redhat.com>
+- add rpmtransGetKeys() to retrieve transaction keys in tsort'ed order.
+- python bindings for rpmtransGetKeys().
+- fix: include alignment in count when swabbing header region.
+
+* Wed Dec  6 2000 Jeff Johnson <jbj@redhat.com>
 - improved find-{requires,provides} for aix4/hpux/irix6/osf.
 		Tim Mooney<mooney@dogbert.cc.ndsu.NoDak.edu>
 - portability: remove use of GNU make subst in lib/Makefile (Joe Orton).
 - python: bind package removal (#21274).
 - autoconfigure building python bindings.
 - autoconfigure generating rpm API doco rpm-devel package.
+- fix: don't fdFree in rpmVerifyScript, rpmtransFree does already.
+- unify rpmError and rpmMessge interfaces through rpmlog.
+- collect and display rpm build error messages at end of build.
+- use package version 3 if --nodirtokens is specified.
+- add package names to problem sets early, don't save removed header.
+- make sure that replaced tags in region are counted in headerSizeof().
+- support for dmalloc debugging.
+- filter region tags in headerNextIterator, exit throut headerReload.
 
 * Thu Nov 30 2000 Jeff Johnson <jbj@redhat.com>
 - add missing headerFree for legacy signature header.