Sanoty (make dist).

CVS patchset: 3931
CVS date: 2000/07/09 23:22:58

26 files changed, 2210 insertions, 2153 deletions

diff --git a/po/cs.po b/po/cs.po
index 2fac381c9..0e1dfd7e7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -922,7 +922,7 @@ msgstr "    --checksig <balík>+   "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    --resign <balík>+     "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1433,7 +1433,7 @@ msgstr "dotazovat všechny balíčky"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "        -f <soubor>+      "
 
 #: rpmqv.c:434
@@ -1443,7 +1443,7 @@ msgstr "dotazy na balíček vlastnící <soubor>"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "        -p <souborbalíku>+  "
 
 #: rpmqv.c:436
@@ -1453,7 +1453,7 @@ msgstr "dotazovat (nenainstalovaný) balíček <souborbalíku>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <balík>"
 
 #: rpmqv.c:438
@@ -1652,7 +1652,7 @@ msgstr "pro sestavení nezadány žádné soubory .spec"
 msgid "no tar files given for build"
 msgstr "pro sestavení nezadány žádné soubory tar"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Nelze otevřít %s pro čtení: %s."
@@ -1806,93 +1806,93 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr "Nelze číst %s: %s."
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Nelze číst %s: %s."
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Soubor nebyl na serveru nalezen"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "soubor %s: %s\n"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Soubor nebyl na serveru nalezen"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "chyba: nelze otevřít soubor %s\n"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "soubor %s: %s\n"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Nelze spustit pgp"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Nelze načíst cílpodpisu"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "chyba pgp"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "%s nelze vytvořit\n"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s nelze vytvořit\n"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "soubor %s: %s\n"
@@ -1975,51 +1975,51 @@ msgstr "%s není typu RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "chyba při vytváření adresáře %s: %s"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "nelze otevřít %s\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Nelze zapsat %s"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Probíhá generování podpisu: %d\n"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nelze zapsat %s"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Nelze zapsat %s"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Nelze zapsat %s"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, fuzzy, c-format
 msgid "Wrote: %s\n"
 msgstr "rpm: %s\n"
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nelze otevřít soubor %s: "
@@ -2365,53 +2365,53 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr "neplatné číslo balíčku: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, fuzzy, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "nelze odstranit %s: %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "chyba: "
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 #, fuzzy
 msgid "Unknown file type"
 msgstr "Neznámý systém: %s\n"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 #, fuzzy
 msgid "Internal error"
 msgstr "interní chyba (chyba rpm?): "
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 #, fuzzy
 msgid " failed - "
 msgstr "chyba pgp"
@@ -2429,79 +2429,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "žádný balíček nevlastní soubor %s\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "žádný balíček nevlastní soubor %s\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "žádný balíček nevlastní soubor %s\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
-#, c-format
-msgid "package %s require not satisfied: %s\n"
+#: lib/depends.c:1122
+#, fuzzy, c-format
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "položka 'vyžaduje' balíčku %s není splněna: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíček %s koliduje: %s\n"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "smyčka v řetězu podmínek: %s"
@@ -2645,7 +2645,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(není číslo)"
 
@@ -2678,74 +2678,74 @@ msgstr "soubor %s je na neznámém zařízení"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Počet RPM_STRING_TYPE pro grabData() musí být 1.\n"
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datový typ %d není podporován\n"
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Chybný počet pro headerAddEntry(): %d\n"
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "po % chybí {"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "po %{ chybí }"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "prázdný formát příznaku"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "prázdný název příznaku"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "neznámý příznak"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "na konci řady se očekávala ]"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "neočekávaná ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "neočekávaná }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "ve výrazu se očekával ?"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr "ve výrazu se po ? očekávala {"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "ve výrazu se očekávala }"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr "v podvýrazu se po ? očekávala :"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr "ve výrazu se po : očekávala {"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "na konci výrazu se očekávala |"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(neznámý typ)"
 
@@ -3241,32 +3241,32 @@ msgstr "žádný balíček nevyžaduje %s\n"
 msgid "no package provides %s\n"
 msgstr "žádný balíček neposkytuje %s\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "žádný balíček nevlastní soubor %s\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neplatné číslo balíčku: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "probíhá dotaz na záznam číslo %d\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "záznam %d nelze načíst\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíček %s není nainstalován\n"
@@ -4180,6 +4180,10 @@ msgid "failed to create %s: %s\n"
 msgstr "%s nelze vytvořit\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    --resign <balík>+     "
+
+#, fuzzy
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "balíček %s není uveden v %s"
 
diff --git a/po/da.po b/po/da.po
index c1ae72649..fc6321de1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -868,7 +868,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1326,15 +1326,16 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
-msgstr ""
+#, fuzzy
+msgid "     -f <file>+           "
+msgstr "    --eval '<name>+'      "
 
 #: rpmqv.c:434
 msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1342,7 +1343,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1506,7 +1507,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1654,92 +1655,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1822,51 +1823,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2210,51 +2211,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2271,79 +2272,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2487,7 +2488,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2520,74 +2521,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3048,32 +3049,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 004d69d93..6eec7f001 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -980,7 +980,7 @@ msgstr "    -b<STUFE> <SPEC>      "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    -b<STUFE> <SPEC>      "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1496,7 +1496,7 @@ msgstr "Anfrage an alle Pakete"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "    -b<STUFE> <SPEC>      "
 
 #: rpmqv.c:434
@@ -1506,7 +1506,7 @@ msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "    -b<STUFE> <SPEC>      "
 
 #: rpmqv.c:436
@@ -1516,7 +1516,7 @@ msgstr "Anfrage nach (nicht installiertem) Paket <PAKET-DATEI>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
 #: rpmqv.c:438
@@ -1715,7 +1715,7 @@ msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
 
 # , c-format
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
@@ -1874,99 +1874,99 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:998
+#: build/files.c:1006
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Konnte pgp nicht durchführen"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Konnte Signatur-Ziel (ťsigtargetŤ) nicht lesen"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "pgp fehlgeschlagen"
 
 # , c-format
-#: build/files.c:1713
+#: build/files.c:1719
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -2052,56 +2052,56 @@ msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
 # , c-format
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:429
+#: build/pack.c:430
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "PGP-Signatur generieren"
 
 # , c-format
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
@@ -2457,53 +2457,53 @@ msgid "line %d: Bad %s number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
 # , c-format
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, fuzzy, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "Fehler: "
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 #, fuzzy
 msgid "Unknown file type"
 msgstr "(unbekannter Typ)"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 #, fuzzy
 msgid "Internal error"
 msgstr "Fataler Fehler: "
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 #, fuzzy
 msgid " failed - "
 msgstr "pgp fehlgeschlagen"
@@ -2521,79 +2521,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, 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:1130
+#: lib/depends.c:1122
 #, fuzzy, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2739,7 +2739,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(keine Zahl)"
 
@@ -2774,77 +2774,77 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "fehlende { nach %{"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "fehlende } nach %{"
 
 # ťTagŤ übersetzen??? -ke-
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "leeres ťTagŤ-Format"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "leerer ťTagŤ-Name"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "unbekannter ťTagŤ"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "] am Ende des Arrays erwartet"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "unerwartete ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "unerwartete }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "? im Ausdruck erwartet"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ nach ? im Ausdruck erwartet"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "} im Ausdruck erwartet"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ": nach ? Unterausdruck erwartet"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ nach : im Ausdruck erwartet"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "| am Ende des Ausdrucks erwartet"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(unbekannter Typ)"
 
@@ -3349,32 +3349,32 @@ msgid "no package provides %s\n"
 msgstr "kein Paket stellt %s bereit\n"
 
 # , c-format
-#: lib/query.c:637
+#: lib/query.c:651
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
@@ -4307,6 +4307,10 @@ msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#, fuzzy
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "Paket %s wird nicht in %s aufgeführt"
 
diff --git a/po/es.po b/po/es.po
index 3f0e22200..e0c4cc933 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -849,7 +849,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1307,7 +1307,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1315,7 +1315,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1323,7 +1323,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1487,7 +1487,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1635,92 +1635,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1803,51 +1803,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2252,79 +2252,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2501,74 +2501,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3029,32 +3029,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 9d91d36c1..cfafdc58f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -952,7 +952,7 @@ msgstr "    -b<vaihe> <määrittely> "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    -b<vaihe> <määrittely> "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1469,7 +1469,7 @@ msgstr "kysele kaikki paketit"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "    -b<vaihe> <määrittely> "
 
 #: rpmqv.c:434
@@ -1479,7 +1479,7 @@ msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "    -b<vaihe> <määrittely> "
 
 #: rpmqv.c:436
@@ -1489,7 +1489,7 @@ msgstr "kysele(asentamatonta) pakettia <pakettitiedosto>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
 #: rpmqv.c:438
@@ -1686,7 +1686,7 @@ msgstr "käännökselle ei annettu määrittelytiedostoja"
 msgid "no tar files given for build"
 msgstr "käännökselle ei määritelty tar-tiedostoja"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "En voi avata %s luettavaksi: %s."
@@ -1840,93 +1840,93 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "En voinut ajaa pgp:tä"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "En voinut ajaa pgp:tä"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "pgp epäonnistui"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "en voinut avata %s: %s"
@@ -2009,51 +2009,51 @@ msgstr "virhe: %s ei vaikuta RPM paketilta\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -2399,53 +2399,53 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, fuzzy, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "virhe: "
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 #, fuzzy
 msgid "Unknown file type"
 msgstr "(tuntematon tyyppi)"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 #, fuzzy
 msgid "Internal error"
 msgstr "vakava virhe: "
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 #, fuzzy
 msgid " failed - "
 msgstr "pgp epäonnistui"
@@ -2463,79 +2463,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, 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:1130
+#: lib/depends.c:1122
 #, fuzzy, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "silmukka edellytysten ketjussa: %s"
@@ -2679,7 +2679,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(ei ole luku)"
 
@@ -2712,76 +2712,76 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "puuttuva '{' '%{':n jälkeen"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "tyhjä nimiön formaatti"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "tyhjä nimiön nimi"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "tuntematon nimiö"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "']' puuttuu taulukkomäärittelyn lopusta"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "odottamaton ']'"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "odottamaton '}'"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "odotin '}'-merkkiä ilmauksessa"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(tuntematon tyyppi)"
 
@@ -3275,32 +3275,32 @@ msgstr "mikään pakettie ei tarvitse %s:a\n"
 msgid "no package provides %s\n"
 msgstr "mikään paketti ei tarjoa %s:a\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
@@ -4220,6 +4220,10 @@ msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#, fuzzy
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "paketti %s ei ole %s:ssä"
 
diff --git a/po/fr.po b/po/fr.po
index dc3719cbf..6cbe2a881 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-09 11:09-0400\n"
+msgstr "POT-Creation-Date: 2000-07-09 19:10-0400\n"
 
 #: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:435
 #, c-format
@@ -934,7 +934,7 @@ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
 #: rpm.c:509 rpmqv.c:616
@@ -1463,7 +1463,7 @@ msgstr ""
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "    -i <packagefile>\t- installe le package"
 
 #: rpmqv.c:434
@@ -1474,7 +1474,7 @@ msgstr ""
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "    -i <packagefile>\t- installe le package"
 
 #: rpmqv.c:436
@@ -1485,7 +1485,7 @@ msgstr ""
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 "        -f <file>+        - interroge le package ŕ qui appartient <file>"
 
@@ -1678,7 +1678,7 @@ msgstr "aucun package n'a été spécifié pour la construction"
 msgid "no tar files given for build"
 msgstr "aucun package n'a été spécifié pour la construction"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "impossible d'ouvrir: %s\n"
@@ -1827,93 +1827,93 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "La construction a échoué.\n"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1996,51 +1996,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "      --sign            - genčre une signature PGP"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2386,51 +2386,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, fuzzy, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 #, fuzzy
 msgid " failed - "
 msgstr "La construction a échoué.\n"
@@ -2448,79 +2448,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, fuzzy, c-format
-msgid "package %s require not satisfied: %s\n"
+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:1197
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2664,7 +2664,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2697,76 +2697,76 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 #, fuzzy
 msgid "unexpected ]"
 msgstr "source de requęte inattendue"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 #, fuzzy
 msgid "unexpected }"
 msgstr "source de requęte inattendue"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3263,32 +3263,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
@@ -4189,6 +4189,10 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
+
+#, fuzzy
 #~ msgid "                        [--sign] [--nobuild] ]"
 #~ msgstr "                          qui matchent <pkg>"
 
diff --git a/po/gl.po b/po/gl.po
index 3f0e22200..e0c4cc933 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -849,7 +849,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1307,7 +1307,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1315,7 +1315,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1323,7 +1323,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1487,7 +1487,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1635,92 +1635,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1803,51 +1803,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2252,79 +2252,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2501,74 +2501,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3029,32 +3029,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 3f0e22200..e0c4cc933 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -849,7 +849,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1307,7 +1307,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1315,7 +1315,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1323,7 +1323,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1487,7 +1487,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1635,92 +1635,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1803,51 +1803,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2252,79 +2252,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2501,74 +2501,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3029,32 +3029,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 3f0e22200..e0c4cc933 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -849,7 +849,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1307,7 +1307,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1315,7 +1315,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1323,7 +1323,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1487,7 +1487,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1635,92 +1635,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1803,51 +1803,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2252,79 +2252,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2501,74 +2501,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3029,32 +3029,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index c0ef771ac..12a71271d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 1.0\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 2000-06-16 02:20+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -844,7 +844,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1302,7 +1302,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1310,7 +1310,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1318,7 +1318,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1482,7 +1482,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1630,92 +1630,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1798,51 +1798,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2186,51 +2186,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2247,79 +2247,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2463,7 +2463,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2496,74 +2496,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3024,32 +3024,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 3f0e22200..e0c4cc933 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -849,7 +849,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1307,7 +1307,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1315,7 +1315,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1323,7 +1323,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1487,7 +1487,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1635,92 +1635,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1803,51 +1803,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2252,79 +2252,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2501,74 +2501,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3029,32 +3029,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 9e18a6ece..35426e75f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -127,7 +127,7 @@ msgstr "copyright ¤Ź¤˘¤ę¤Ţ¤ť¤ó!\n"
 # build root [BuildRoot]
 # net share [ĽÍĽĂĽČśŚÍ­]
 # reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.85 2000/07/09 15:17:12 jbj Exp $
+# $Id: ja.po,v 1.86 2000/07/09 23:22:59 jbj Exp $
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -920,7 +920,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1408,7 +1408,7 @@ msgid "query/verify all packages"
 msgstr "Á´¤Ć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1417,8 +1417,9 @@ msgid "query/verify package owning <file>"
 msgstr "<file> ¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
-msgstr ""
+#, fuzzy
+msgid "     -p <packagefile>+    "
+msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
 #: rpmqv.c:436
 #, fuzzy
@@ -1429,7 +1430,7 @@ msgstr ""
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "<pkg> ¤Ë¤č¤Ă¤ĆĽČĽęĽŹĄź¤ľ¤ě¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
 #: rpmqv.c:438
@@ -1616,7 +1617,7 @@ msgstr "şîŔŽ¤Î¤ż¤á¤Î spec ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 msgid "no tar files given for build"
 msgstr "şîŔŽ(build)¤Î¤ż¤á¤Î tar ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "°ěťţĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó"
@@ -1769,93 +1770,93 @@ msgstr "ž¤ÎĽŐĽŠĄźĽŕ¤ÇĆĂĘĚ¤Ę %%doc ¤ňşŽ¤ź¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó: %s"
 msgid "File listed twice: %s"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ź2˛óÉ˝ľ­¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ď prefix (%s) ¤Č°ěĂפˇ¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "ÉÔŔľ¤Ę˝ęÍ­źÔ/Ľ°ĽëĄźĽ×: %s\n"
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "ĽŐĽĄĽ¤Ľë¤ĎŔčĆŹ¤Ë \"/\" ¤ŹÉŹÍפǤš: %s"
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó(by glob): %s"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "%%files ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "šÔĚÜ: %s"
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "ÉÔŔľ¤Ę˝ęÍ­źÔ/Ľ°ĽëĄźĽ×: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "%s ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "%s ¤ň fork ¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr "%s źşÇÔ"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "Á´¤Ć¤ÎĽÇĄźĽż¤ň %s ¤Ë˝ń¤Ż¤ł¤Č¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "%s ¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤š: (%s ¤ňťČÍѤˇ¤Ć¤¤¤Ţ¤š)...\n"
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s ¤ň¸Ť¤Ä¤ą¤ë¤Î¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż:"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Î˝čÍýĂć: %s-%s-%s\n"
@@ -1938,51 +1939,51 @@ msgstr "readRPM: %s ¤Ď RPM ĽŃĽĂĽąĄźĽ¸¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ¤Ť¤é¤ÎĽŘĽĂĽŔ¤ÎĆɤߚţ¤ß\n"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr "ÉÔŔľ¤Ę CSA ĽÇĄźĽż"
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "˝đĚž¤ÎŔ¸ŔŽĂć: %d\n"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "sigtarget ¤ÎĆɤߚţ¤ß¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "sigtarget ¤ÎĆɤߚţ¤ß¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "˝ń¤­šţ¤ßĂć: %s\n"
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Î ˝ĐÎĎĽŐĽĄĽ¤ĽëĚž¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s\n"
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s\n"
@@ -2329,53 +2330,53 @@ msgstr "%d šÔĚÜ: ÉÔŔľ¤Ę no%s ČÖšć: %d"
 msgid "line %d: Bad %s number: %s\n"
 msgstr "%d šÔĚÜ: ÉÔŔľ¤Ę %s ČÖšć: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, fuzzy, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s ¤ň %s ¤Ë¤š¤ëĚžÁ°¤ÎĘŃšš¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, fuzzy, c-format
 msgid "can't unlink %s: %s\n"
 msgstr "%s ¤ňşď˝ü(unlink)¤Ç¤­¤Ţ¤ť¤ó: %s\n"
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "(Ľ¨ĽéĄź 0x%x)"
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr "ÉÔŔľ¤ĘĽŢĽ¸ĽĂĽŻ"
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr "ÉÔŔľ¤Ę/ÉÔ˛ÄĆɤʼؼüŔ"
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr "ĽŘĽĂĽŔĽľĽ¤Ľş¤ŹÂ礭¤š¤Ž¤Ţ¤š"
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 #, fuzzy
 msgid "Unknown file type"
 msgstr "ÉÔĚŔ¤ĘĽŐĽĄĽ¤ĽëĽżĽ¤Ľ×"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr "ĽĎĄźĽÉĽęĽóĽŻ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 #, fuzzy
 msgid "Internal error"
 msgstr "ĆâÉôĽ¨ĽéĄź"
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 #, fuzzy
 msgid " failed - "
 msgstr "źşÇÔ - "
@@ -2395,79 +2396,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %s ¤ĎĽŐĽĄĽ¤ĽëĽęĽšĽČ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %s ¤Ď provide ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s ¤Ď rpmrc ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s ¤Ď db ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "%s: %s ¤Ď db ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr "%s: %s ¤Ď rpmlib ¤ÎĽĐĄźĽ¸ĽçĽó¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ć¤¤¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
-#, c-format
-msgid "package %s require not satisfied: %s\n"
+#: lib/depends.c:1122
+#, fuzzy, c-format
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤ČśĽšç¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤š: %s\n"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "prerequisite ĽÁĽ§ĄźĽó¤ÎĽëĄźĽ×: %s"
@@ -2616,7 +2617,7 @@ msgstr ""
 "žÜşŮ¤ĘžđĘ󤏟čĆŔ¤Ç¤­¤Ţ¤šĄŁ\n"
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
 
@@ -2649,74 +2650,74 @@ msgstr "ĽŐĽĄĽ¤Ľë %s ¤ĎÉÔĚŔ¤ĘĽÇĽĐĽ¤Ľš¤Ç¤š"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ĽŤĽŚĽóĽČ¤Ď 1 ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤óĄŁ\n"
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ĽÇĄźĽżĽżĽ¤Ľ× %d ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "headerAddEntry() ¤ÎÉÔŔľ¤ĘĽŤĽŚĽóĽČ: %d\n"
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "% ¤Î¸ĺ¤Ë { ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "%{ ¤Î¸ĺ¤Ë } ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "śő¤ÎĽżĽ°ĽŐĽŠĄźĽŢĽĂĽČ"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "śő¤ÎĽżĽ°Ěž"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "ÉÔĚŔ¤ĘĽżĽ°"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "ÇŰÎó¤Î¸ĺ¤Ë ] ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "Í˝´ü¤ť¤Ě ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "Í˝´ü¤ť¤Ě }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "ź°Ăć¤Ç ? ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr "ź°Ăć¤Ç ? ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "ź°Ăć¤Ë } ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr "°Ę˛ź¤Î ? ĽľĽÖź°¤Î ¤Ë: ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr "ź°Ăć¤Ç : ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "ź°¤Î˝Ş¤ę¤Ë | ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(ÉÔĚŔ¤ĘĽżĽ¤Ľ×)"
 
@@ -3219,32 +3220,32 @@ msgstr "%s ¤ňÉŹÍפȤš¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 msgid "no package provides %s\n"
 msgstr "%s ¤ňÄ󜥤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ď¤É¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤â°¤ˇ¤Ć¤¤¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "Ěľ¸ú¤ĘĽŃĽĂĽąĄźĽ¸ČÖšć: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
diff --git a/po/ko.po b/po/ko.po
index 3f0e22200..e0c4cc933 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -849,7 +849,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1307,7 +1307,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1315,7 +1315,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1323,7 +1323,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1487,7 +1487,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1635,92 +1635,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1803,51 +1803,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2252,79 +2252,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2501,74 +2501,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3029,32 +3029,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 8d5886dbf..270d3e88d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 2000-06-22 21:59+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -873,8 +873,9 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
-msgstr ""
+#, fuzzy
+msgid "    -K <pkg>+             "
+msgstr "    --pipe <kmd>          "
 
 #: rpm.c:509 rpmqv.c:616
 msgid "verify package signature"
@@ -1331,24 +1332,27 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
-msgstr ""
+#, fuzzy
+msgid "     -f <file>+           "
+msgstr "        -f <fil>+         "
 
 #: rpmqv.c:434
 msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
-msgstr ""
+#, fuzzy
+msgid "     -p <packagefile>+    "
+msgstr "        -p <pakkefil>+ "
 
 #: rpmqv.c:436
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
-msgstr ""
+#, fuzzy
+msgid "     --triggeredby <pkg>  "
+msgstr "        --triggeredby <pakke>"
 
 #: rpmqv.c:438
 msgid "query/verify packages triggered by <pkg>"
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1659,92 +1663,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1827,51 +1831,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2215,51 +2219,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2276,79 +2280,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2492,7 +2496,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2525,74 +2529,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3053,32 +3057,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index ba1776930..db0c92d93 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -912,7 +912,7 @@ msgstr "    --checksig <pakiet>+  "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    --resign <pakiet>+    "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1412,7 +1412,7 @@ msgstr "odpytuj wszystkie pakiety"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "        -f <plik>+        "
 
 #: rpmqv.c:434
@@ -1422,7 +1422,7 @@ msgstr "zapytaj do jakiego pakietu należy <plik>"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "        -p <nazwa pakietu>+ "
 
 #: rpmqv.c:436
@@ -1432,7 +1432,7 @@ msgstr "odpytaj (niezainstalowany) pakiet <nazwa pakietu>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <pakiet>"
 
 #: rpmqv.c:438
@@ -1631,7 +1631,7 @@ msgstr "nie podano nazw plików spec do budowania"
 msgid "no tar files given for build"
 msgstr "nie podano nazw plików tar do budowania"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Nie można otworzyć pliku tymczasowego"
@@ -1783,93 +1783,93 @@ msgstr "Nie można mieszać specjalnej %%doc z innymi formami: %s"
 msgid "File listed twice: %s"
 msgstr "Plik podany dwukrotnie: %s"
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Plik nie zgadza się z prefiksem (%s): %s"
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Błędny użytkownik/grupa: %s\n"
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Plik %4d: 0%o %s.%s\t %s\n"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Plik musi się zaczynać od \"/\": %s"
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Nie można otworzyć %%files pliku: %s"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "linia: %s"
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "plik %s: %s\n"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "Błędny użytkownik/grupa: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Nie można uruchomić %s"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Nie można wykonać fork na %s"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr "%s nie powiodło się"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "zapisanie wszystkich danych do %s nie powiodło się"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Wyszukiwanie wymaganych zasobów...\n"
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Wyszukiwanie nie powiodło się"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Przetwarzanie plików: %s\n"
@@ -1952,51 +1952,51 @@ msgstr "readRPM: %s nie jest pakietem RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: czytanie nagłówka z %s\n"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr "Błędne dane CSA"
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nie można otworzyć %s\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Nie można zapisać pakietu: %s"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nie można odczytać sigtarget: %s"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Nie można odczytać sigtarget: %s"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Nie można zapisać pakietu: %s"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie można wygenerować wyjściowej nazwy dla pakietu %s: %s\n"
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie można utworzyć %s"
@@ -2341,51 +2341,51 @@ msgstr "linia %d: błędny numer no%s: %d"
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linia %d: Błędny numer %s: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "nie można zmienić nazwy %s na %s: %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr "nie można odwiązać %s: %s\n"
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(błąd 0x%x)"
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr "Błędny magic"
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr "Błędny/nieczytelny nagłówek"
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr "Rozmiar nagłówka jest zbyt duży"
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr "Nieznany typ pliku"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr "Brak twardego dowiązania"
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr " nie powiodło się -"
 
@@ -2402,79 +2402,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "plik %s nie należy do żadnego pakietu\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "plik %s nie należy do żadnego pakietu\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, 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:1130
-#, c-format
-msgid "package %s require not satisfied: %s\n"
+#: lib/depends.c:1122
+#, 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:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2618,7 +2618,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(nie jest liczbą)"
 
@@ -2651,74 +2651,74 @@ msgstr "plik %s jest na nieznanym urządzeniu"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi być 1.\n"
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obsługiwany\n"
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Błedny licznik dla headerAddEntry(): %d\n"
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "brak { po %"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "brak } po %{"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "pusty format etykiety"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "pusta nazwa etykiety"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "nieznana etykieta"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "spodziewany ] na końcu tablicy"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "nie spodziewany ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "nie spodziewany }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "spodziewany ? w wyrażeniu"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr "spodziewany { po ? w wyrażeniu"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "spodziewany } w wyrażeniu"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr "spodziewany : po podwyrażeniu ?"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr "spodziewany { po : w wyrażeniu"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "spodziewany | na końcu wyrażenia"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(nieznany typ)"
 
@@ -3198,32 +3198,32 @@ msgstr "żaden pakiet nie wymaga %s\n"
 msgid "no package provides %s\n"
 msgstr "żaden pakiet nie udostępnia %s\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "plik %s nie należy do żadnego pakietu\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "błędny numer pakietu: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "numer rekordu pakietu: %d\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "nie można odczytać rekordu %d\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
@@ -4124,6 +4124,10 @@ msgstr "port musi być liczbą\n"
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiodło się\n"
 
+#, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    --resign <pakiet>+    "
+
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "linia %d: Wersja niedozwolona: %s"
 
diff --git a/po/pt.po b/po/pt.po
index 3f0e22200..e0c4cc933 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -849,7 +849,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1307,7 +1307,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1315,7 +1315,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1323,7 +1323,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1487,7 +1487,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1635,92 +1635,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1803,51 +1803,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2252,79 +2252,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2501,74 +2501,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3029,32 +3029,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b2f8a1590..d36ba3cca 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-09 11:09-0400\n"
+msgstr "POT-Creation-Date: 2000-07-09 19:10-0400\n"
 
 #: build.c:25 lib/rpminstall.c:253 lib/rpminstall.c:435
 #, c-format
@@ -963,7 +963,7 @@ msgstr "    -b<estágio> <spec>    "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    -b<estágio> <spec>    "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1496,7 +1496,7 @@ msgstr "pesquise todos os pacotes"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "    -b<estágio> <spec>    "
 
 #: rpmqv.c:434
@@ -1506,7 +1506,7 @@ msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "    -b<estágio> <spec>    "
 
 #: rpmqv.c:436
@@ -1516,7 +1516,7 @@ msgstr "pesquise pacote (năo instalado) <arquivo-pacote>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
 #: rpmqv.c:438
@@ -1714,7 +1714,7 @@ msgid "no tar files given for build"
 msgstr "năo foram passados arquivos tar para construçăo"
 
 # , c-format
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Năo consegui abrir: %s\n"
@@ -1875,100 +1875,100 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:998
+#: build/files.c:1006
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "năo foi passado pacote para desinstalaçăo"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "năo foi passado pacote para desinstalaçăo"
 
 # , c-format
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Năo consegui abrir: %s\n"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 # , c-format
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "Construçăo falhou.\n"
 
 # , c-format
-#: build/files.c:1713
+#: build/files.c:1719
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "Năo consegui abrir o pipe tar: %s\n"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Năo consegui abrir o pipe tar: %s\n"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2054,57 +2054,57 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
 # , c-format
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:429
+#: build/pack.c:430
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Năo consegui abrir: %s\n"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "gere assinatura PGP"
 
 # , c-format
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Năo consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Năo consegui abrir: %s\n"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
@@ -2462,51 +2462,51 @@ msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, fuzzy, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "Năo consegui ler o arquivo spec de %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 #, fuzzy
 msgid " failed - "
 msgstr "Construçăo falhou.\n"
@@ -2524,79 +2524,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, fuzzy, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "năo foi passado pacote para instalaçăo"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "năo foi passado pacote para desinstalaçăo"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2742,7 +2742,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2777,76 +2777,76 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 #, fuzzy
 msgid "unexpected ]"
 msgstr "fonte de pesquisa năo esperado"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 #, fuzzy
 msgid "unexpected }"
 msgstr "fonte de pesquisa năo esperado"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3342,32 +3342,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "năo foi passado pacote para instalaçăo"
@@ -4325,6 +4325,10 @@ msgid "failed to create %s: %s\n"
 msgstr "Năo consegui abrir o pipe tar: %s\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
 #~ msgid "                        [--sign] [--nobuild] ]"
 #~ msgstr ""
 #~ "                        [--sign] [--test] [--timecheck <S>] arquivo-spec"
diff --git a/po/ro.po b/po/ro.po
index 5bb2e3863..db33a550c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -844,7 +844,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1302,7 +1302,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1310,7 +1310,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1318,7 +1318,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1482,7 +1482,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1630,92 +1630,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1798,51 +1798,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2186,51 +2186,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2247,79 +2247,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2463,7 +2463,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2496,74 +2496,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3024,32 +3024,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 8f637d3b3..e0c4cc933 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 18:45-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:363
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:369
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:616
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1078
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1081
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1082
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1100
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1101
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1102
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1112
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 6524a7e8d..948316c63 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -905,7 +905,7 @@ msgstr "    --checksig <pkg>+     "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    --resign <pkg>+       "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1415,7 +1415,7 @@ msgstr "ÚÁĐŇĎÓÉÔŘ ×ÓĹ ĐÁËĹÔŮ"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "        -f <ĆÁĘĚ>+        "
 
 #: rpmqv.c:434
@@ -1425,7 +1425,7 @@ msgstr "ÎÁĘÔÉ ĐÁËĹÔ, ËĎÔĎŇĎÍŐ ĐŇÉÎÁÄĚĹÖÉÔ <ĆÁĘĚ>"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "        -p <ĆÁĘĚ ĐÁËĹÔÁ>+ "
 
 #: rpmqv.c:436
@@ -1435,7 +1435,7 @@ msgstr "ÚÁĐŇĎÓÉÔŘ (ÎĹŐÓÔÁÎĎ×ĚĹÎÎŮĘ) ĐÁËĹÔ <ĆÁĘĚ ĐÁËĹÔÁ>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <pkg>"
 
 #: rpmqv.c:438
@@ -1635,7 +1635,7 @@ msgstr "ÎĹ ÚÁÄÁÎ spec-ĆÁĘĚ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
 msgid "no tar files given for build"
 msgstr "ÎĹ ÚÁÄÁÎŮ tar-ĆÁĘĚŮ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "îĹ ÍĎÇŐ ĎÔËŇŮÔŘ ×ŇĹÍĹÎÎŮĘ ĆÁĘĚ"
@@ -1787,93 +1787,93 @@ msgstr "îĹĚŘÚŃ ÓÍĹŰÉ×ÁÔŘ ÓĐĹĂ. %%doc Ó ÄŇŐÇÉÍÉ ĆĎŇÍÁÍÉ: %s"
 msgid "File listed twice: %s"
 msgstr "ćÁĘĚ ŐËÁÚÁÎ Ä×ÁÖÄŮ: %s"
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "ćÁĘĚ ÎĹ ĎÔ×ĹŢÁĹÔ ĐŇĹĆÉËÓŐ (%s): %s"
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr "ćÁĘĚ ÎĹ ÎÁĘÄĹÎ: %s"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "îĹ×ĹŇÎÁŃ ĐÁŇÁ ČĎÚŃÉÎ/ÇŇŐĐĐÁ: %s\n"
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "ćÁĘĚ %4d: 0%o %s.%s\t %s\n"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "ćÁĘĚ ÄĎĚÖĹÎ ÎÁŢÉÎÁÔŘÓŃ Ó \"/\": %s"
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "ćÁĘĚ ÎĹ ÎÁĘÄĹÎ: %s"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "îĹ ÍĎÇŐ ĎÔËŇŮÔŘ ĆÁĘĚ %%files: %s"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "ÓÔŇĎËÁ: %s"
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "ĆÁĘĚ %s: %s\n"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "îĹ×ĹŇÎÁŃ ĐÁŇÁ ČĎÚŃÉÎ/ÇŇŐĐĐÁ: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "îĹ ÍĎÇŐ ÉÓĐĎĚÎÉÔŘ %s"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "îĹ ÍĎÇŐ ĆĎŇËÎŐÔŘ %s"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr "%s ÎĹ ŐÄÁĚĎÓŘ"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "ÚÁĐÉÓŘ ×ÓĹČ ÄÁÎÎŮČ × %s ÎĹ ŐÄÁĚÁÓŘ"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "ďĐŇĹÄĹĚŃŔ ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ...\n"
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "ďŰÉÂËÁ ĎĐŇĹÄĹĚĹÎÉŃ ÓĹŇ×ÉÓĎ×, ĐŇĹÄĎÓÔÁ×ĚŃĹÍŮČ ĐÁËĹÔĎÍ"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ďÂŇÁÂÁÔŮ×ÁŔ ĆÁĘĚŮ: %s\n"
@@ -1956,51 +1956,51 @@ msgstr "readRPM: %s - ÎĹ ĐÁËĹÔ RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ŢÉÔÁŔ ČĹÄĹŇ ÉÚ %s\n"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr "îĹ×ĹŇÎŮĹ ÄÁÎÎŮĹ CSA"
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "îĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "îĹ ÍĎÇŐ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ: %s"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "çĹÎĹŇÉŇŐŔ ĐĎÄĐÉÓŘ: %d\n"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "îĹ ÍĎÇŐ ĐŇĎŢÉÔÁÔŘ ĂĹĚŘ ĐĎÄĐÉÓÉ: %s"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "îĹ ÍĎÇŐ ĐŇĎŢÉÔÁÔŘ ĂĹĚŘ ĐĎÄĐÉÓÉ: %s"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "îĹ ÍĎÇŐ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ: %s"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁĐÉÓÁÎ: %s\n"
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "îĹ ÍĎÇŐ ÓÇĹÎĹŇÉŇĎ×ÁÔŘ ÉÍŃ ĆÁĘĚÁ ÄĚŃ ĐÁËĹÔÁ %s: %s\n"
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ÎĹ ÍĎÇŐ ÓĎÚÄÁÔŘ %s"
@@ -2344,51 +2344,51 @@ msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎĎĹ ŢÉÓĚĎ no%s: %d"
 msgid "line %d: Bad %s number: %s\n"
 msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎĎĹ ŢÉÓĚĎ %s: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "ÎĹ ÍĎÇŐ ĐĹŇĹÉÍĹÎĎ×ÁÔŘ %s × %s: %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr "ÎĹ ÍĎÇŐ ŐÄÁĚÉÔŘ %s: %s\n"
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(ĎŰÉÂËÁ 0x%x)"
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr "îĹ×ĹŇÎŮĘ magic"
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr "îĹ×ĹŇÎŮĘ/ÎĹŢÉÔÁĹÍŮĘ ÚÁÇĎĚĎ×ĎË"
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr "úÁÇĎĚĎ×ĎË ÓĚÉŰËĎÍ ×ĹĚÉË"
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr "îĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ ĆÁĘĚÁ"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr "ďÔÓŐÔÓÔ×ŐĹÔ ÖĹÓÔËÁŃ ÓÓŮĚËÁ"
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ"
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr "ÎĹ ŐÄÁĚĎÓŘ - "
 
@@ -2405,79 +2405,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
-#, c-format
-msgid "package %s require not satisfied: %s\n"
+#: lib/depends.c:1122
+#, fuzzy, c-format
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ĐÁËĹÔ %s ËĎÎĆĚÉËÔŐĹÔ Ó: %s\n"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "ÚÁÍËÎŐÔŮĘ ĂÉËĚ × ĂĹĐĎŢËĹ ÔŇĹÂĎ×ÁÎÉĘ ÄĚŃ ŐÓÔÁÎĎ×ËÉ: %s"
@@ -2621,7 +2621,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(ÎĹ ŢÉÓĚĎ)"
 
@@ -2654,74 +2654,74 @@ msgstr "ĆÁĘĚ %s - ÎÁ ÎĹÉÚ×ĹÓÔÎĎÍ ŐÓÔŇĎĘÓÔ×Ĺ"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE count must be 1.\n"
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉĐ ÄÁÎÎŮČ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "îĹ×ĹŇÎĎĹ ŢÉÓĚĎ ÄĚŃ headerAddEntry(): %d\n"
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"{\" ĐĎÓĚĹ \"%\""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"}\" ĐĎÓĚĹ \"%{\""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "ĐŐÓÔĎĘ ĆĎŇÍÁÔ ÔÜÇÁ"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "ĐŐÓÔĎĹ ÉÍŃ ÔÜÇÁ"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "× ËĎÎĂĹ ÍÁÓÓÉ×Á ĎÖÉÄÁĚÁÓŘ \"]\""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"]\""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"}\""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚÓŃ \"?\""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚÁÓŘ \"{\""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚÁÓŘ \"}\""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \":\""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \":\" ĎÖÉÄÁĚÁÓŘ \"{\""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(ÎĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ)"
 
@@ -3198,32 +3198,32 @@ msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ÔŇĹÂŐĹÔ %s\n"
 msgid "no package provides %s\n"
 msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ĐŇĹÄĎÓÔÁ×ĚŃĹÔ %s\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ĆÁĘĚ %s: %s\n"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ÎĹ×ĹŇÎŮĘ ÎĎÍĹŇ ĐÁËĹÔÁ: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ÚÁĐÉÓŘ ĐÁËĹÔÁ ÎĎÍĹŇ %d\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "ÚÁĐÉÓŘ %d ÎĹ ŢÉÔÁĹÔÓŃ\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
@@ -4124,6 +4124,10 @@ msgid "failed to create %s: %s\n"
 msgstr "ÎĹ ÍĎÇŐ ÓĎÚÄÁÔŘ %s\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    --resign <pkg>+       "
+
+#, fuzzy
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "ÓÔŇĎËÁ %d: ÷ %s ÔŇĹÂŐĹÔÓŃ ×ĹŇÓÉŃ: %s"
 
diff --git a/po/sk.po b/po/sk.po
index 990c635ca..0b8746769 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -915,7 +915,7 @@ msgstr "    --checksig <balík>+   "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    --resign <balík>+     "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1419,7 +1419,7 @@ msgstr "opýtať sa na všetky balíky"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "        -f <súbor>+       "
 
 #: rpmqv.c:434
@@ -1429,7 +1429,7 @@ msgstr "opýtať sa na balík vlastniaci <súbor>"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "        -p <súbor_balíku>+"
 
 #: rpmqv.c:436
@@ -1439,7 +1439,7 @@ msgstr "opýtať sa (nenainštalovaného) balíku <súbor_balíku>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <balík>"
 
 #: rpmqv.c:438
@@ -1638,7 +1638,7 @@ msgstr "neboli zadané žiadne spec-súbory pre zostavenie"
 msgid "no tar files given for build"
 msgstr "neboli zadané žiadne tar-súbory pre zostavenie"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Nie je možné otvoriť dočasný súbor"
@@ -1791,93 +1791,93 @@ msgstr "Nie je možné miešať špeciálne %%doc s inými formami: %s"
 msgid "File listed twice: %s"
 msgstr "Súbor zadaný dvakrát: %s."
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Súbor nesúhlasí s prefixom (%s): %s."
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr "Súbor nebol nájdený: %s"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Chybný vlastník/skupina: %s\n"
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Súbor %4d: 0%o %s.%s\t %s\n"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Súbor potrebuje na začiatku \"/\": %s"
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Súbor nebol nájdený: %s"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "chybe: nie je možné otvoriť %%files súbor: %s"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "riadok: %s"
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "súbor %s: %s\n"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "Chybný vlastník/skupina: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Nie je možné spustiť %s"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Nie je možné vytvoriť proces %s"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr "%s zlyhalo"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "nepodarilo sa zapísať všetky dáta do %s"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Zisťujú sa požadované vlastnosti...\n"
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Nepodarilo sa zistiť poskytované vlastnosti"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Spracovávajú sa súbory: %s\n"
@@ -1960,51 +1960,51 @@ msgstr "readRPM: %s nie je RPM balík\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: čítanie hlavičky %s\n"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr "Chybné CSA dáta"
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Nie je možné zapísať balík: %s"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nie je prečítať sigtarget: %s"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Nie je prečítať sigtarget: %s"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Nie je možné zapísať balík: %s"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie je možné vytvoriť meno výstupného súboru pre balík %s: %s\n"
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie je možné zapísať do %s: "
@@ -2348,51 +2348,51 @@ msgstr "riadok %d: Chybné no%s číslo: %d"
 msgid "line %d: Bad %s number: %s\n"
 msgstr "riadok %d: Chybné %s číslo: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "premenovanie %s na %s zlyhalo: %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(chyba 0x%x)"
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr "Chybné magické číslo"
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr "Chybná/nečitateľná hlavička"
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr "Priveľká hlavička"
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr "Neznámy typ súboru"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr "Interná chyba"
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr " zlyhalo - "
 
@@ -2409,79 +2409,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, 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:1130
-#, c-format
-msgid "package %s require not satisfied: %s\n"
+#: lib/depends.c:1122
+#, 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:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "slučka v reťazi požiadaviek: %s"
@@ -2625,7 +2625,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(nie je číslo)"
 
@@ -2658,74 +2658,74 @@ msgstr "súbor %s sa nachádza na neznámom zariadení"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE počet musí byť 1.\n"
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovaný\n"
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Chybný počet pre headerAddEntry(): %d\n"
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "chýbajúce { po %"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "chýbajúce } po %{"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "prázdny tag formát"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "prázdne meno tagu"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "neznámy tag"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "] očakávané na konci poľa"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "neočakávané ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "neočakávané }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "? očakávané vo výraze"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr "{ očakávané po ? vo výraze"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "} očakávané vo výraze"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ": očakávané po ? podvýraze"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr "{ očakávané po : vo výraze"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "| očakávené na konci výrazu"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(neznámy typ)"
 
@@ -3205,32 +3205,32 @@ msgstr "žiadny z balíkov nevyžaduje %s\n"
 msgid "no package provides %s\n"
 msgstr "žiadny z balíkov neposkytuje %s\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "chybné číslo balíku: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "požaduje sa záznam číslo %d\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "záznam %d nie je možné prečítať\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nainštalovaný\n"
@@ -4133,6 +4133,10 @@ msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvoriť %s\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    --resign <balík>+     "
+
+#, fuzzy
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "riadok %d: V %s sú vyžadované verzie: %s"
 
diff --git a/po/sl.po b/po/sl.po
index cadb75d23..28dc2081b 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.70 2000/07/09 15:17:12 jbj Exp $
+# $Id: sl.po,v 1.71 2000/07/09 23:22:59 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -908,7 +908,7 @@ msgstr "    --checksig <paket>+   "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    --resign <paket>+     "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1405,7 +1405,7 @@ msgstr "poizvedba po vseh paketih"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "        -f <datoteka>+    "
 
 #: rpmqv.c:434
@@ -1415,7 +1415,7 @@ msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "        -p <paket>+       "
 
 #: rpmqv.c:436
@@ -1425,7 +1425,7 @@ msgstr "poizvedba po (že nameščenem) <paketu>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <pkg>"
 
 #: rpmqv.c:438
@@ -1624,7 +1624,7 @@ msgstr "datoteka spec za izgradnjo manjka"
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Začasne datoteke ni možno odpreti"
@@ -1773,92 +1773,92 @@ msgstr "Posebnih %%doc ni možno mešati z ostalimi oblikami: %s"
 msgid "File listed twice: %s"
 msgstr "Datoteka je navedena dvakrat: %s"
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr "Simbolna povezava kaže na BuildRoot: %s -> %s"
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Datoteka se ne ujema s predpono (%s): %s"
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr "Datoteke ni najti: %s"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Okvarjen lastnik/skupina: %s\n"
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Datoteka: %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Datoteki manjka uvodni \"/\": %s"
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr "Datoteke ni možno najti z razširitvijo metaznakov v imenu: %s"
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr "Datoteke %s iz %%files ni možno odpreti: %s"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "vrstica: %s"
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr "Okvarjena datoteka: %s: %s"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "Okvarjen lastnik/skupina: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Ni možno izvesti %s: %s"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Vejitev %s ni možna: %s"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr "%s neuspešen"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "pisanje podatkov na %s neuspešno"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Iščemo  %s: (z uporabo %s)...\n"
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr "Neuspešno iskanje %s:"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Obdelujemo datoteke: %s-%s-%s\n"
@@ -1941,51 +1941,51 @@ msgstr "readRPM: %s ni paket tipa RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: branje glave %s\n"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr "Okvarjeni podatki CSA"
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Ni možno odpreti %s: %s\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Ni možno zapisati paketa: %s"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Izdelujemo podpis: %d\n"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Ciljnega podpisa %s ni možno odpreti: %s"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Ciljni podpis %s ni berljiv: %s"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Ni možno zapisati paketa %s: %s"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Neuspešno ustvarjanje izhodne datoteke za paket %s: %s\n"
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ni možno ustvariti %s: %s\n"
@@ -2331,51 +2331,51 @@ msgstr "vrstica %d: Okvarjeno število no%s: %d"
 msgid "line %d: Bad %s number: %s\n"
 msgstr "vrstica %d: Okvarjeno število %s: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "ni možno preimenovati %s v %s: %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr "ni možno zbrisati %s: %s\n"
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(napaka 0x%x)"
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr "Okvarjeno magično število"
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr "Okvarjena/neberljiva glava"
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr "Glava predolga"
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr "Neznan tip datoteke"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr "Trda povezava manjka"
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr "Interna napaka"
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr " neuspešno - "
 
@@ -2394,79 +2394,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %s zadovoljen ob dodatnem seznamu datotek.\n"
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n"
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s zadovoljen ob ponudbi db.\n"
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "%s: %s zadovoljen ob paketih db.\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr "%s: %s zadovoljen ob različici rpmlib.\n"
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
-#, c-format
-msgid "package %s require not satisfied: %s\n"
+#: lib/depends.c:1122
+#, fuzzy, c-format
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s zahteva, a ni zadovoljeno: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s v sporu: %s\n"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "zanka v predpogojevani verigi: %s"
@@ -2614,7 +2614,7 @@ msgstr ""
 "na strani http://www.rpm.org ali po dopisni listi rpm-list@redhat.com.\n"
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(ni število)"
 
@@ -2647,74 +2647,74 @@ msgstr "datoteka %s se nahaja na neznani napravi"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "števec grabData() RPM_STRING_TYPE mora biti 1.\n"
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Okvarjen števec za headerAddEntry(): %d\n"
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "manjkajoči { za %"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "manjkajoči } za %{"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "oblika značke manjka"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "ime značke manjka"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "neznana značka"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "] ni pričakovan na koncu polja"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "nepričakovan ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "nepričakovan }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "? pričakovan v izrazu"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr "{ pričakovan za ? v izrazu"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "} pričakovan v izrazu"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ": pričakovan za podizrazom ?"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr "{ pričakovan za : v izrazu"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "| pričakovan na koncu izraza"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(neznan tip)"
 
@@ -3191,32 +3191,32 @@ msgstr "noben paket ne potrebuje %s\n"
 msgid "no package provides %s\n"
 msgstr "noben paket ne nudi %s\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ni del nobenega paketa\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neveljavna številka paketa: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "številka zapisa paketa: %d\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "zapisa %d ni možno prebrati\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni nameščen\n"
@@ -4111,6 +4111,10 @@ msgstr "vrata URL morajo biti številka\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspešno ustvarjanje %s: %s\n"
 
+#, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    --resign <paket>+     "
+
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "vrstica %d: Različica ni dovoljena: %s"
 
diff --git a/po/sr.po b/po/sr.po
index 7f8c4a87e..4d32834ad 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -920,7 +920,7 @@ msgstr "    -b<faza> <spec>\t "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    -b<faza> <spec>\t "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1420,7 +1420,7 @@ msgstr "upit nad svim paketima"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "    -b<faza> <spec>\t "
 
 #: rpmqv.c:434
@@ -1430,7 +1430,7 @@ msgstr "upit nad paketom koji ima <datoteku>"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "    -b<faza> <spec>\t "
 
 #: rpmqv.c:436
@@ -1440,7 +1440,7 @@ msgstr "upit za (deinstaliran) paket <paketdatoteka>"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "upit nad paketom koji ima <datoteku>"
 
 #: rpmqv.c:438
@@ -1636,7 +1636,7 @@ msgstr "nedostaje specifikacije za kreiranje"
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Ne mogu da otvorim %s za čitanje: %s"
@@ -1790,93 +1790,93 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Datoteka nije pronađena na serveru"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Datoteka nije pronađena na serveru"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "greška: ne mogu da otvorim datoteku %s\n"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Ne mogu da izvršim PGP"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Ne mogu da pročitam 'sigtarget'"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "PGP omanuo"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -1959,51 +1959,51 @@ msgstr "greška: čini se da %s nije RPM paket\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "greška kod uzimanja sloga %s iz %s"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "napravi PGP potpis"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -2349,53 +2349,53 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, fuzzy, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "greška: "
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 #, fuzzy
 msgid "Unknown file type"
 msgstr "(nepoznat tip)"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 #, fuzzy
 msgid "Internal error"
 msgstr "fatalna greška: "
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 #, fuzzy
 msgid " failed - "
 msgstr "PGP omanuo"
@@ -2413,79 +2413,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, 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:1130
+#: lib/depends.c:1122
 #, fuzzy, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "petlja u lancu: %s"
@@ -2629,7 +2629,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(nije broj)"
 
@@ -2662,76 +2662,76 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "nedostaje { posle %"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "nedostaje } posle %"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "prazan 'tag' format'"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "prazno ime tag-a"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "nepoznat tag"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "] očekivano na kraju niza"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "neočekivano ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "neočekivano }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "očekivan znak ? u izrazu"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ očekivano posle ? u izrazu"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "} očekivano u izrazu"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr "očekivano : praćeno ? podizrazom"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ očekivano posle : u izrazu"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "| očekivano na kraju izraza"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(nepoznat tip)"
 
@@ -3224,32 +3224,32 @@ msgstr "nijedan paket ne zahteva %s\n"
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbeđuje %s\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "ne mogu da pročitam slog %d\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
@@ -4169,6 +4169,10 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#, fuzzy
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "paket %s nije naveden u %s"
 
diff --git a/po/sv.po b/po/sv.po
index 899b20281..0bca2db9b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-0400\n"
 "PO-Revision-Date: 2000-06-22 23:35+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -876,8 +876,9 @@ msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pkt>+"
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
-msgstr "    -K <pkt>+           "
+#, fuzzy
+msgid "    -K <pkg>+             "
+msgstr "   -K <pkt>+             "
 
 #: rpm.c:509 rpmqv.c:616
 msgid "verify package signature"
@@ -1356,7 +1357,8 @@ msgid "query/verify all packages"
 msgstr "frĺga om/verifiera alla paket"
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+#, fuzzy
+msgid "     -f <file>+           "
 msgstr "     -f <fil>+           "
 
 #: rpmqv.c:434
@@ -1364,7 +1366,8 @@ msgid "query/verify package owning <file>"
 msgstr "frĺga om/verifiera paket som äger <fil>"
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+#, fuzzy
+msgid "     -p <packagefile>+    "
 msgstr "     -p <paketfil>+      "
 
 #: rpmqv.c:436
@@ -1372,7 +1375,8 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "frĺga om/verifiera (oinstallerat) paket <paketfil>"
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+#, fuzzy
+msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <pkt> "
 
 #: rpmqv.c:438
@@ -1537,7 +1541,7 @@ msgstr "ingen spec-filer angivna för tillverkning"
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna för tillverkning"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr "Kan inte öppna temporär fil."
 
@@ -1685,92 +1689,92 @@ msgstr "Kan inte blanda special %%doc med andra former: %s"
 msgid "File listed twice: %s"
 msgstr "Filen uppräknad tvĺ gĺnger: %s"
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr "Symbolisk länk pekar pĺ BuildRoot: %s -> %s"
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Filen matchar inte prefixet (%s): %s"
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr "Filen hittades inte: %s"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Felaktig ägare/grupp: %s\n"
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Fil %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Filen behöver inledande \"/\": %s"
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr "Ingen file hittades vid matchningen: %s"
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr "Kunde inte öppna %%files-fil %s: %s"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "rad: %s"
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr "Felaktig fil: %s: %s"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "Felaktig ägare/grupp: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Kunde inte köra %s: %s"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Kunde inte grena %s: %s"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr "%s misslyckades"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "kunde inte skriva all data till %s"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Letar upp %s: (använder %s)...\n"
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr "Misslyckades hitta %s:"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Bearbetar filer: %s-%s-%s\n"
@@ -1853,51 +1857,51 @@ msgstr "readRPM: %s är inte ett RPM-paket\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: läser huvud frĺn %s\n"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr "Felaktig CSA-data"
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Kunde inte skriva paket: %s"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererar signatur: %d\n"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Kan inte läsa signaturen %s: %s"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Kan inte läsa signaturen %s: %s"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Kan inte skriva paket %s: %s"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n"
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -2241,51 +2245,51 @@ msgstr "rad %d: Felaktigt no%s-tal: %d"
 msgid "line %d: Bad %s number: %s\n"
 msgstr "rad %d: Felaktigt %s-tal: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan inte flytta %s till %s: %s\n"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr "kan inte ta bort %s: %s\n"
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(fel 0x%x)"
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr "Felaktigt magiskt tal"
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr "Felaktigt/oläsbart huvud"
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr "Huvudstorlek för stor"
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr "Okänd filtyp"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr "Saknad hĺrdlänk"
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr " misslyckades - "
 
@@ -2304,79 +2308,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s JA (lade till filer)\n"
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "%s: %-45s JA (lade till paket)\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr "%s: %-45s JA (lade till paket, BORDE INTE HÄNDA)\n"
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s JA (lade till tillhandahĺllande)\n"
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr "%s: %-45s %-3s (cachad)\n"
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandahĺller)\n"
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tillhandahĺllande)\n"
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "%s: %-45s JA (db-paket)\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr "%s: %45s JA (rpmlib-version)\n"
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, 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:1130
-#, c-format
-msgid "package %s require not satisfied: %s\n"
+#: lib/depends.c:1122
+#, fuzzy, c-format
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s behov inte uppfyllda: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s stĺr i konflikt: %s\n"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "cirkularitet i kedja av förutsättningar: %s"
@@ -2525,7 +2529,7 @@ msgstr ""
 "problemet.\n"
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(inte ett tal)"
 
@@ -2558,74 +2562,74 @@ msgstr "filen %s är pĺ en okänd enhet"
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE mĺste vara 1.\n"
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Felaktigt antal till headerAddEntry(): %d\n"
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "{ fattas efter %"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "} fattas efter %{"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "tomt taggformat"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "tomt taggnamn"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "okänd tagg"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "] förväntades vid slutet pĺ vektor"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "oväntad ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "oväntad }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "? förväntades i uttryck"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr "{ förväntades efter ? i uttryck"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "} förväntades i uttryck"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ": förväntades efter ? i deluttryck"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr "{ förväntades efter : i uttryck"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "| förväntades vid slutet pĺ uttryck"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(okänd typ)"
 
@@ -3089,32 +3093,32 @@ msgstr "inget paket behöver %s\n"
 msgid "no package provides %s\n"
 msgstr "inget paket tillhandahĺller %s\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "fil %s ägs inte av nĺgot paket\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paketpost nummer: %u\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "post %d kunde inte läsas\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
@@ -4039,5 +4043,8 @@ msgstr "url-port mĺste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    -K <pkt>+           "
+
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "rad %d: Version inte tillĺten: %s"
diff --git a/po/tr.po b/po/tr.po
index c7b6392e7..39c0e448f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -959,7 +959,7 @@ msgstr "    -b<adým> <spec>      "
 
 #: rpm.c:508
 #, fuzzy
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr "    -b<adým> <spec>      "
 
 #: rpm.c:509 rpmqv.c:616
@@ -1465,7 +1465,7 @@ msgstr "Tüm paketleri sorgulama"
 
 #: rpmqv.c:433
 #, fuzzy
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr "    -b<adým> <spec>      "
 
 #: rpmqv.c:434
@@ -1475,7 +1475,7 @@ msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
 #: rpmqv.c:435
 #, fuzzy
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr "    -b<adým> <spec>      "
 
 #: rpmqv.c:436
@@ -1485,7 +1485,7 @@ msgstr "(henüz yüklenmemiţ) <paket dosyasý> paketi sorgulama"
 
 #: rpmqv.c:437
 #, fuzzy
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
 #: rpmqv.c:438
@@ -1681,7 +1681,7 @@ msgstr "oluţturma için gerekli spec dosyasý belirtilmedi"
 msgid "no tar files given for build"
 msgstr "oluţturma için gereken tar dosyalarý belirttilmedi"
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "%s okuma eriţimi için açýlamadý:%s."
@@ -1835,93 +1835,93 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr "%s okunamadý: %s"
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "%s okunamadý: %s"
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Dosya sunucuda bulunamadý"
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Dosya sunucuda bulunamadý"
 
-#: build/files.c:1221
+#: build/files.c:1227
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "hata: %s dosyasý okunamadý\n"
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "%s açýlamadý: %s"
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "PGP çalýţtýrýlamadý"
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Ýmza hedefi 'sigtarget' okunamadý"
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "PGP hata verdi"
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "%s yaratýlamýyor\n"
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s yaratýlamýyor\n"
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "%s açýlamadý: %s"
@@ -2004,52 +2004,52 @@ msgstr "hata: %s herhangi bir RPM pakedine ait görünmüyor\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "%s kaydýna %s dosyasýnda eriţilemiyor:"
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
 # , c-format
-#: build/pack.c:397
+#: build/pack.c:398
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s 'ye eriţimde hata oluţtu\n"
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "%s 'nin yazýlmasý mümkün deđil"
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "PGP-imzasý yaratýr"
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "%s 'nin yazýlmasý mümkün deđil"
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "%s 'nin yazýlmasý mümkün deđil"
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "%s 'nin yazýlmasý mümkün deđil"
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s dosyasý açýlamýyor: "
@@ -2396,53 +2396,53 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr "geçersiz paket numarsý: %s\n"
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, fuzzy, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s okunamadý: %s"
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "hata: "
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 #, fuzzy
 msgid "Unknown file type"
 msgstr "(bilinmeyen tip)"
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 #, fuzzy
 msgid "Internal error"
 msgstr "ölümcül hata: "
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 #, fuzzy
 msgid " failed - "
 msgstr "PGP hata verdi"
@@ -2460,79 +2460,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, 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:1130
+#: lib/depends.c:1122
 #, fuzzy, c-format
-msgid "package %s require not satisfied: %s\n"
+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:1197
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "gerekenler zincirinde döngü: %s"
@@ -2676,7 +2676,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr "(üye deđil)"
 
@@ -2709,76 +2709,76 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr "% den sonra eksik {"
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr "%{ den sonra eksik }"
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr "boţ tag tanýmlamasý"
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr "boţ tag ismi"
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr "bilinmeyen tag"
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr "dizinin sonunda ] bekleniyordu"
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr "beklenmeyen ]"
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr "beklenmeyen }"
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "dizi içerisinde ? den sonra { bekleniyordu"
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr "dizi içerisinde } bekleniyordu"
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr "? altdizisinden sonra : bekleniyordu"
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "dizide : den sonra { bekleniyordu"
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr "dizinin sonunda | bekleniyordu"
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr "(bilinmeyen tip)"
 
@@ -3274,32 +3274,32 @@ msgstr "hiç bir paket %s gerektirmiyor\n"
 msgid "no package provides %s\n"
 msgstr "hiç bir paket  %s sađlamýyor\n"
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s dosyasý, hiç bir pakete ait deđil\n"
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "geçersiz paket numarsý: %s\n"
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "geçersiz paket numarsý: %s\n"
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "%d numaralý kayýt okunamadý\n"
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s pakedi yüklenmemiţ\n"
@@ -4219,6 +4219,10 @@ msgid "failed to create %s: %s\n"
 msgstr "%s yaratýlamýyor\n"
 
 #, fuzzy
+#~ msgid "    -K <pkg>+           "
+#~ msgstr "    -b<adým> <spec>      "
+
+#, fuzzy
 #~ msgid "line %d: Version not permitted: %s"
 #~ msgstr "%s paketi %s altýnda gözükmüyor"
 
diff --git a/po/uk.po b/po/uk.po
index 3f0e22200..e0c4cc933 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 11:09-0400\n"
+"POT-Creation-Date: 2000-07-09 19:10-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"
@@ -849,7 +849,7 @@ msgid "    --checksig <pkg>+"
 msgstr ""
 
 #: rpm.c:508
-msgid "    -K <pkg>+           "
+msgid "    -K <pkg>+             "
 msgstr ""
 
 #: rpm.c:509 rpmqv.c:616
@@ -1307,7 +1307,7 @@ msgid "query/verify all packages"
 msgstr ""
 
 #: rpmqv.c:433
-msgid "     -f <file>+          "
+msgid "     -f <file>+           "
 msgstr ""
 
 #: rpmqv.c:434
@@ -1315,7 +1315,7 @@ msgid "query/verify package owning <file>"
 msgstr ""
 
 #: rpmqv.c:435
-msgid "     -p <packagefile>+   "
+msgid "     -p <packagefile>+    "
 msgstr ""
 
 #: rpmqv.c:436
@@ -1323,7 +1323,7 @@ msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
 #: rpmqv.c:437
-msgid "     --triggeredby <pkg> "
+msgid "     --triggeredby <pkg>  "
 msgstr ""
 
 #: rpmqv.c:438
@@ -1487,7 +1487,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:349
+#: build/build.c:110 build/pack.c:350
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1635,92 +1635,92 @@ msgstr ""
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:913
+#: build/files.c:917
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:998
+#: build/files.c:1006
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1008
+#: build/files.c:1016
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1051
+#: build/files.c:1059
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1065
+#: build/files.c:1071
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1139
+#: build/files.c:1145
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1168
+#: build/files.c:1174
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1221
+#: build/files.c:1227
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1228 build/pack.c:100
+#: build/files.c:1234 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1555
+#: build/files.c:1561
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1567 build/parsePrep.c:34
+#: build/files.c:1573 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1622
+#: build/files.c:1628
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1633
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1709
+#: build/files.c:1715
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1713
+#: build/files.c:1719
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1809
+#: build/files.c:1815
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1837 build/files.c:1847
+#: build/files.c:1843 build/files.c:1853
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1957
+#: build/files.c:1963
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1803,51 +1803,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:361
+#: build/pack.c:362
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:397
+#: build/pack.c:398
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:429
+#: build/pack.c:430
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:444
+#: build/pack.c:445
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:460
+#: build/pack.c:461
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:470
+#: build/pack.c:471
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:481
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:495
+#: build/pack.c:496
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:564
+#: build/pack.c:560
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:581
+#: build/pack.c:577
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -2191,51 +2191,51 @@ msgstr ""
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:358
+#: lib/cpio.c:361
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:364
+#: lib/cpio.c:367
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:608
+#: lib/cpio.c:611
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1069
+#: lib/cpio.c:1072
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1072
+#: lib/cpio.c:1075
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1073
+#: lib/cpio.c:1076
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1091
+#: lib/cpio.c:1094
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1092
+#: lib/cpio.c:1095
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1093
+#: lib/cpio.c:1096
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1094
+#: lib/cpio.c:1097
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1103
+#: lib/cpio.c:1106
 msgid " failed - "
 msgstr ""
 
@@ -2252,79 +2252,79 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:844
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:893
+#: lib/depends.c:885
 #, c-format
 msgid "%s: %-45s YES (added package)\n"
 msgstr ""
 
-#: lib/depends.c:897
+#: lib/depends.c:889
 #, c-format
 msgid "%s: %-45s YES (added package, SHOULDN'T HAPPEN)\n"
 msgstr ""
 
-#: lib/depends.c:916
+#: lib/depends.c:908
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:960
+#: lib/depends.c:952
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:977
+#: lib/depends.c:969
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1000
+#: lib/depends.c:992
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1013
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1027
+#: lib/depends.c:1019
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1044
+#: lib/depends.c:1036
 #, c-format
 msgid "%s: %-45s YES (rpmlib version)\n"
 msgstr ""
 
-#: lib/depends.c:1055
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1076
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1130
+#: lib/depends.c:1122
 #, c-format
-msgid "package %s require not satisfied: %s\n"
+msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1197
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1324
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2468,7 +2468,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:86 lib/formats.c:106 lib/formats.c:138
-#: lib/header.c:2190 lib/header.c:2206 lib/header.c:2225
+#: lib/header.c:2092 lib/header.c:2108 lib/header.c:2127
 msgid "(not a number)"
 msgstr ""
 
@@ -2501,74 +2501,74 @@ msgstr ""
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:815 lib/install.c:323
+#: lib/header.c:250 lib/header.c:721 lib/install.c:323
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1174
+#: lib/header.c:1078
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1583
+#: lib/header.c:1485
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1611
+#: lib/header.c:1513
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1623
+#: lib/header.c:1525
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1633
+#: lib/header.c:1535
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1648
+#: lib/header.c:1550
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1674
+#: lib/header.c:1575
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1690
+#: lib/header.c:1591
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1692
+#: lib/header.c:1593
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1746
+#: lib/header.c:1648
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1655
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1763 lib/header.c:1798
+#: lib/header.c:1666 lib/header.c:1701
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1771
+#: lib/header.c:1674
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1785
+#: lib/header.c:1688
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1806
+#: lib/header.c:1709
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1974
+#: lib/header.c:1874
 msgid "(unknown type)"
 msgstr ""
 
@@ -3029,32 +3029,32 @@ msgstr ""
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:637
+#: lib/query.c:651
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:640
+#: lib/query.c:654
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:665
+#: lib/query.c:680
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:668
+#: lib/query.c:683
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:672
+#: lib/query.c:687
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:683 lib/rpminstall.c:448
+#: lib/query.c:698 lib/rpminstall.c:448
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""