- split file info tag sets into rpmfi.c.

- create toy TFI_t iterators.

CVS patchset: 5179
CVS date: 2001/11/13 19:04:33

31 files changed, 1840 insertions, 2550 deletions

diff --git a/po/cs.po b/po/cs.po
index 60a47c56f..4be6d51e6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -831,7 +831,7 @@ msgstr "Nemohu přečíst hlavičku z %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevřít %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat balíček: %s\n"
@@ -861,7 +861,7 @@ msgstr "Nemohu přečíst payload z %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
@@ -1476,11 +1476,11 @@ msgstr "žádné balíčky\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) přidáno do keše závislostí.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "NE "
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "ANO"
 
@@ -1615,7 +1615,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Počet dataLength() RPM_STRING_TYPE musí být 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datový typ %d není podporován\n"
@@ -2216,108 +2216,74 @@ msgstr " koliduje s %s-%s-%s\n"
 msgid "is needed by"
 msgstr " je nutné pro %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== relokace\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d vynechávám %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d přemísťuji %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "vynechávám multilib cestu %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "vynechávám %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "přemísťuji %s do %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "přemísťuji adresář %s do %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nemohu vytvořit %s: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "zdrojový balíček neobsahuje .spec soubor\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: spouštím %s skript(y) (pokud existují)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratový kód byl: %s\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s obsahuje %d souborů, test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: scriptlet %s selhal (%d), přeskakuji %s-%s-%s\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uživatel %s neexistuje - použit uživatel root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - použita skupina root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalování archívu selhalo %s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otevřít %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
@@ -2365,91 +2331,91 @@ msgstr "balíček nemá vlastníka souboru ani seznamy id\n"
 msgid "can't query %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otevření %s selhalo: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "dotaz na %s se nezdařil\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "nelze provést dotaz na zdrojové balíčky starého formátu\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "žádné balíčky\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje žádné balíčky\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "žádný balíček neaktivuje %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "žádný balíček nevyžaduje %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "žádný balíček neposkytuje %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "soubor %s nevlastní žádný balíček\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neplatné číslo balíčku: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "záznam balíčku číslo: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "záznam %d nelze přečíst\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíček %s není nainstalován\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "špatný db soubor %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
@@ -2518,7 +2484,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2527,13 +2493,13 @@ msgstr ""
 "Závislost \"B\" potřebuje období (předpokládáno stejné jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n"
@@ -2866,18 +2832,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s přeskočeno, protože chybí příznak\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "vynechávám adresář %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "získávám seznam připojených systémů souborů\n"
 
@@ -2892,17 +2858,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "balíček neobsahuje ani jména skupin ani seznam id (nemělo by se nikdy stát)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "chybí      %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nevyřešené závislosti pro %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: kontrola digestu v hlavičce selhala\n"
@@ -3417,6 +3383,27 @@ msgstr "url port musí být číslo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvořit %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== relokace\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d vynechávám %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d přemísťuji %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "vynechávám multilib cestu %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "vynechávám %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "přemísťuji %s do %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "přemísťuji adresář %s do %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s ANO (přidány soubory)\n"
diff --git a/po/da.po b/po/da.po
index 1d0b419fc..0aba6a180 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -828,7 +828,7 @@ msgstr "Kunne ikke lćse hoved fra %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke ĺbne %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
@@ -858,7 +858,7 @@ msgstr "Kunne ikke lćse pakkeindhold fra %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1477,12 +1477,12 @@ msgstr "ingen pakker\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tilfřjet til afhćngigheds-buffer.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1615,7 +1615,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE-antal skal vćre 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d understřttes ikke\n"
@@ -2235,110 +2235,76 @@ msgstr " skaber konflikt med %s-%s-%s\n"
 msgid "is needed by"
 msgstr " krćves af %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== gemmer omrokeringer\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d ekskluderer %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d omrokerer %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "ekskluderer multilib-sti %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "ekskluderer %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "omrokerer %s til %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "omrokerer kataloget %s til %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binćr fundet\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "křrer postinstallations-skript (hvis det findes)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "křrsel af smĺskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 "křrsel af smĺskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pakke: %s-%s-%s filer test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "bruger %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "gruppe %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke ĺbne %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
@@ -2386,91 +2352,91 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 msgid "can't query %s: %s\n"
 msgstr "kunne ikke forespřrge %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "ĺbning af %s mislykkedes %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "forespřrgsel af %s mislykkedes\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "pakke med gammelt kildeformat kan ikke forespřrges\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lćs manifest mislykkedes: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "forespřrgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s indeholder ingen pakker\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakker udlřser %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakker krćver %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakker tilfřrer %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tilhřrer ingen pakke\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "pakkens post-nummer: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "post %d kunne ikke lćses\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db tilfřrer)\n"
@@ -2539,7 +2505,7 @@ msgid "OK"
 msgstr "O.K."
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2548,13 +2514,13 @@ msgstr ""
 "\"B\"-afhćngighed krćver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
@@ -2888,18 +2854,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s oversprunget grundet manglende ok-flag\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer kataloget %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "henter liste over monterede filsystemer\n"
 
@@ -2915,17 +2881,17 @@ msgstr ""
 "pakken har hverken en liste over gruppenavne eller id (det burde ikke kunne "
 "ske)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "manglende  %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Ikke-tilfredsstillede afhćngighedskrav for %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3446,6 +3412,27 @@ msgstr "url-port skal vćre et tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== gemmer omrokeringer\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d ekskluderer %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d omrokerer %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "ekskluderer multilib-sti %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "ekskluderer %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "omrokerer %s til %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "omrokerer kataloget %s til %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s JA (tilfřjede filer)\n"
diff --git a/po/de.po b/po/de.po
index 507355b10..dbc0edfb9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
@@ -956,7 +956,7 @@ msgstr "Nicht möglich %s zu schreiben"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1613,11 +1613,11 @@ msgstr "Anfrage an alle Pakete"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1755,7 +1755,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2407,114 +2407,77 @@ msgstr " steht im Konflikt mit %s-%s-%s\n"
 msgid "is needed by"
 msgstr " wird von %s-%s-%s gebraucht\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-# , c-format
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "Hole %s heraus\n"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "kann Datei %s nicht öffnen: "
-
-# , c-format
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "Hole %s heraus\n"
-
-# , c-format
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "Hole %s heraus\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "Keine Stufen ausführen"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
@@ -2564,95 +2527,95 @@ msgstr "Paket hat keinen Namen"
 msgid "can't query %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "kein Paket triggert %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "kein Paket verlangt %s\n"
 
 # oder besser: ... listet %s auf? -ke-
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "kein Paket stellt %s bereit\n"
 
 # , c-format
-#: lib/query.c:804
+#: lib/query.c:798
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, 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:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
 
 # , c-format
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
@@ -2723,20 +2686,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -3086,18 +3049,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -3109,17 +3072,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "fehlende { nach %{"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3650,6 +3613,29 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
+# , c-format
+#, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "Hole %s heraus\n"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "kann Datei %s nicht öffnen: "
+
+# , c-format
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "Hole %s heraus\n"
+
+# , c-format
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "Hole %s heraus\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
diff --git a/po/en_RN.po b/po/en_RN.po
index 432fb27ec..3aefd71bc 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 432fb27ec..3aefd71bc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 432fb27ec..3aefd71bc 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 9dbc06048..588f7075c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -835,7 +835,7 @@ msgstr "%s:n kirjoitus ei onnistu"
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
@@ -865,7 +865,7 @@ msgstr "%s:n kirjoitus ei onnistu"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1495,11 +1495,11 @@ msgstr "kysele kaikki paketit"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1632,7 +1632,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2269,109 +2269,75 @@ msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 msgid "is needed by"
 msgstr "vaatii %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "Haen: %s\n"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "en voinut avata tiedostoa %s: "
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "Haen: %s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "Haen: %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "virhe luotaessa hakemistoa %s: %s"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp epäonnistui"
@@ -2421,92 +2387,92 @@ msgstr "paketilla ei ole nimeä"
 msgid "can't query %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "mikään paketti ei laukaise %s:a\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "mikään pakettie ei tarvitse %s:a\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "mikään paketti ei tarjoa %s:a\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
@@ -2577,20 +2543,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
@@ -2935,18 +2901,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2958,17 +2924,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3491,6 +3457,26 @@ msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "Haen: %s\n"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "en voinut avata tiedostoa %s: "
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "Haen: %s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "Haen: %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "virhe luotaessa hakemistoa %s: %s"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "tiedostoa %s ei omista mikään paketti\n"
 
diff --git a/po/fr.po b/po/fr.po
index 1d5c6bba7..83cb6d4ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1532,11 +1532,11 @@ msgstr "aucun package n'a t spcifi pour l'installation"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1667,7 +1667,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2317,110 +2317,76 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
@@ -2470,92 +2436,92 @@ msgstr "aucun package n'a t spcifi pour l'installation"
 msgid "can't query %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2624,20 +2590,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2978,18 +2944,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -3001,17 +2967,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3522,6 +3488,14 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
 #~ msgid "package %s conflicts: %s\n"
 #~ msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
diff --git a/po/gl.po b/po/gl.po
index 0b00b70de..e00a06e16 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1444,11 +1444,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1579,7 +1579,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2164,108 +2164,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2313,90 +2279,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2464,20 +2430,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2806,18 +2772,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2829,17 +2795,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 432fb27ec..3aefd71bc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 432fb27ec..3aefd71bc 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 5cee14fb8..4ceb79ca6 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -815,7 +815,7 @@ msgstr "Get ekki lesiđ haus úr %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki ritađ í pakka: %s\n"
@@ -845,7 +845,7 @@ msgstr "Get ekki lesiđ innihald %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki ritađ innihald í %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifađi: %s\n"
@@ -1450,11 +1450,11 @@ msgstr "uppfćra pakka"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1585,7 +1585,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2175,108 +2175,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d fćra %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "gat ekki búiđ til %%%s %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki ritađ í %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skrá\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opnađ %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s brást\n"
@@ -2324,90 +2290,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: gat ekki lesiđ manifest: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2475,20 +2441,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2817,18 +2783,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2840,17 +2806,17 @@ msgstr "í pakkanum eru engir notandalistar (ţetta ćtti aldrei ađ koma fyrir)\n"
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr "í pakkanum eru engir hópalistar (ţetta ćtti aldrei ađ koma fyrir)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "vantar     %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Óuppfyllt pakkaskilyrđi fyrir %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3358,6 +3324,9 @@ msgstr "gátt slóđar verđur ađ vera tala\n"
 msgid "failed to create %s: %s\n"
 msgstr "gat ekki búiđ til %s: %s\n"
 
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d fćra %s -> %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s NO\n"
 #~ msgstr "%s: %s\n"
diff --git a/po/it.po b/po/it.po
index 432fb27ec..3aefd71bc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index d53d9d9a8..9ac255cb7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -862,7 +862,7 @@ msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
@@ -892,7 +892,7 @@ msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "˝ń¤­šţ¤ßĂć: %s\n"
@@ -1527,11 +1527,11 @@ msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤ĎĽŃĽĂĽąĄźĽ¸¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1665,7 +1665,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ĽŤĽŚĽóĽČ¤Ď 1 ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤óĄŁ\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ĽÇĄźĽżĽżĽ¤Ľ× %d ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
@@ -2327,111 +2327,77 @@ msgstr " %s-%s-%s ¤ČśĽšç¤ˇ¤Ţ¤š\n"
 msgid "is needed by"
 msgstr "¤Ď %s-%s-%s ¤ËÉŹÍפȤľ¤ě¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%s ¤Ř˝ń¤­šţ¤á¤Ţ¤ť¤ó"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "ĽćĄźĽś %s ¤Ď¸şß¤ˇ¤Ţ¤ť¤ó - root ¤ňťČÍѤˇ¤Ţ¤š"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Ľ°ĽëĄźĽ× %s ¤Ď¸şß¤ˇ¤Ţ¤ť¤ó - root ¤ňťČÍѤˇ¤Ţ¤š"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ÎĽ˘ĄźĽŤĽ¤ĽÖ¤Îż­Äš¤ËźşÇÔ %s%s: %s"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 #, fuzzy
 msgid " on file "
 msgstr "ĽŐĽĄĽ¤Ľëžĺ"
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s źşÇÔ"
@@ -2480,92 +2446,92 @@ msgstr "ĽŃĽĂĽąĄźĽ¸¤ĎĽŐĽĄĽ¤Ľë˝ęÍ­źÔ¤ä id ĽęĽšĽČ¤ň¤É¤Á¤é¤âťý¤Ă¤Ć¤¤¤Ţ¤ť¤ó"
 msgid "can't query %s: %s\n"
 msgstr "%s ¤ňşď˝ü(unlink)¤Ç¤­¤Ţ¤ť¤ó: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë %s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤żĄ˘ĽŃĄźĽš¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Ľ°ĽëĄźĽ× %s ¤Ë°¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s ¤ňÉŹÍפȤš¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s ¤ňÄ󜥤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ď¤É¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤â°¤ˇ¤Ć¤¤¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "Ěľ¸ú¤ĘĽŃĽĂĽąĄźĽ¸ČÖšć: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %s ¤Ď db ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
@@ -2636,7 +2602,7 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2645,13 +2611,13 @@ msgstr ""
 "\"B\" ¤Î°Í¸Ŕ­¤Ď epoch ¤ňÉŹÍפȤˇ¤Ţ¤š(\"A\"¤ČĆą¤¸¤Ç¤˘¤ë¤Č˛žÄꤡ¤Ć)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
@@ -2995,18 +2961,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "˝đĚžĽŃĽĂĽÉ: %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ď missingok ĽŐĽéĽ°¤Î¤ż¤áĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "ĽŢĽŚĽóĽČ¤ľ¤ě¤żĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕ¤ÎĽęĽšĽČ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
@@ -3024,17 +2990,17 @@ msgstr ""
 "ĽŃĽĂĽąĄźĽ¸¤ĎĽ°ĽëĄźĽ×Ěž¤Č id ĽęĽšĽČ¤ÎΞĘý¤Źˇç¤ą¤Ć¤¤¤Ţ¤š(¤ł¤ě¤Ďˇč¤ˇ¤ĆľŻ¤­¤Ć¤Ď¤Ę"
 "¤é¤Ę¤¤)"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "%s ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó\n"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "%s-%s-%s ¤Î¤ż¤á¤Î°Í¸Ŕ­¤ňËţ¤ż¤ˇ¤Ć¤¤¤Ţ¤ť¤ó:"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3565,6 +3531,29 @@ msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %s ¤ĎĽŐĽĄĽ¤ĽëĽęĽšĽČ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
diff --git a/po/ko.po b/po/ko.po
index a3fecdeaf..a796b057d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -822,7 +822,7 @@ msgstr "ź­¸í(signature) Çě´ő¸Ś ´Ů˝Ă ŔĐžîżĂ źö žř˝Ŕ´Ď´Ů.\n"
 msgid "Could not open %s: %s\n"
 msgstr "%s (Ŕť)¸Ś ż­ źö žřŔ˝: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ĆĐĹ°Áö¸Ś ŔŰźşÇŇ źö žřŔ˝: %s\n"
@@ -852,7 +852,7 @@ msgstr "%s ŔÇ payload¸Ś ŔĐŔť źö žřŔ˝: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s żĄ payload¸Ś ŔŰźşÇŇ źö žřŔ˝: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "ŔŰźş: %s\n"
@@ -1467,11 +1467,11 @@ msgstr "ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ŔÇÁ¸(Depends) Äł˝ĂżĄ Ăß°ĄľÇžú˝Ŕ´Ď´Ů.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "žĆ´ĎżŔ"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "żš"
 
@@ -1606,7 +1606,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE ÄŤżîĆŽ´Â šÝľĺ˝Ă '1' ŔĚžîžß ÇŐ´Ď´Ů.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d ľĽŔĚĹÍ ŔŻÇüŔş ťçżëÇĎ˝Ç źö žř˝Ŕ´Ď´Ů\n"
@@ -2216,114 +2216,80 @@ msgstr " %s-%s-%s (żÍ)°ú ĂćľšÇŐ´Ď´Ů\n"
 msgid "is needed by"
 msgstr " (Ŕş)´Â %s-%s-%s żĄź­ ÇĘżäˇÎ ÇŐ´Ď´Ů\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== ŔçščÄĄ\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d ÁŚżÜ(exclude)  %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d ŔçščÄĄ %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "%s%s multilib °ćˇÎ¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "%s %s (Ŕť)¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "%s żĄź­ %s (Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "%s ľđˇşĹ与¸Ś %s (Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s %s (Ŕť)¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s (Ŕť)¸Ś ŔŰźşÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "źŇ˝ş ĆĐĹ°Áö°Ą żäą¸ľË´Ď´Ů, šŮŔ̳ʸŽ¸Ś ĂŁžŇ˝Ŕ´Ď´Ů\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "źŇ˝ş ĆĐĹ°ÁöżĄ .spec ĆÄŔĎŔĚ Ć÷ÇԾǞî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s ˝şĹŠ¸łĆŽ¸Ś ˝ÇÇŕÇŐ´Ď´Ů (ŔÖŔť °ćżě)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "%2$s-%3$s-%4$s ŔÇ %1$s ˝şĹŠ¸łĆŽ¸´(scriptlet) ˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů, waitpid°Ą %"
 "5$s (Ŕť)¸Ś šÝČŻÇĎż´˝Ŕ´Ď´Ů \n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 "%2$s-%3$s-%4$s ŔÇ %1$s ˝şĹŠ¸łĆŽ¸´(scriptlet) ˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů, Ážˇá ťóȲ %"
 "5$d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s (ŔĚ)°Ą %d ŔÇ ĆÄŔĎŔť °Ž°í ŔÖ˝Ŕ´Ď´Ů, Ĺ×˝şĆŽ = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 "%s: %s ˝şĹŠ¸łĆŽ¸´(scriptlet)°Ą ˝ÇĆĐÇß˝Ŕ´Ď´Ů (%d), %s-%s-%s (Ŕť)¸Ś ťýˇŤÇŐ´Ď"
 "´Ů\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "%s ťçżëŔÚ°Ą Á¸ŔçÇĎÁö žĘ˝Ŕ´Ď´Ů - root¸Ś ŔĚżëÇŐ´Ď´Ů\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "%s ą×ˇěŔĚ Á¸ŔçÇĎÁö žĘ˝Ŕ´Ď´Ů - root¸Ś ŔĚżëÇŐ´Ď´Ů\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "žĆÄŤŔ̺긌 ÇŞ´ÂľĽ ˝ÇĆĐÇÔ%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " ´ŮŔ˝ ĆÄŔĎżĄ "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ĆÄŔĎŔÇ %1$s (ŔĚ)°Ą ˝ÇĆĐÇÔ: %3$s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s (ŔĚ)°Ą ˝ÇĆĐÇÔ: %s\n"
@@ -2371,91 +2337,91 @@ msgstr "ĆĐĹ°ÁöżĄ ĆÄŔĎ źŇŔŻŔÚ śÇ´Â id ¸ńˇĎŔĚ žř˝Ŕ´Ď´Ů\n"
 msgid "can't query %s: %s\n"
 msgstr "%s (Ŕť)¸Ś ÁúŔÇÇŇ źö žřŔ˝: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s (Ŕť)¸Ś żŠ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s (Ŕť)¸Ś ÁúŔÇÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "ŔĚŔü Çü˝ÄŔÇ źŇ˝ş ĆĐĹ°Áö´Â ÁúŔÇÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ŔĐ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s spec ĆÄŔĎŔť ÁúŔÇÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů, ĆÄŔĎŔť şĐźŽÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s ą×ˇěŔş žîś˛ ĆĐĹ°ÁöżĄľľ Ć÷ÇԾǞî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s (Ŕť)¸Ś šßťý˝ĂĹ°´Â ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s (Ŕť)¸Ś ÇĘżäˇÎ ÇĎ´Â ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s (Ŕť)¸Ś ÁŚ°řÇĎ´Â ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "%s ĆÄŔĎ: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s ĆÄŔĎŔş žîś˛ ĆĐĹ°ÁöżĄľľ źÓÇŘ ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "şÎŔűÇŐÇŃ ĆĐĹ°Áö šřČŁ: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ĆĐĹ°Áö ąâˇĎ(record) šřČŁ: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "ąâˇĎ(record) šřČŁ %u (Ŕş)´Â ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ĆĐĹ°Áö´Â źłÄĄľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "Ŕ߸řľČ db ĆÄŔĎ    %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s żš (db°Ą ÁŚ°řÇÔ)\n"
@@ -2524,7 +2490,7 @@ msgid "OK"
 msgstr "ČŽŔÎ"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2533,13 +2499,13 @@ msgstr ""
 "\"B\" ŔÇÁ¸źşŔş Áßżä˝Ă ľÇ´Â °Í(epoch)Ŕť ÇĘżäˇÎ ÇŐ´Ď´Ů (\"A\" ˇÎ °ĄÁ¤ÇŐ´Ď´Ů)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "%s-%s-%s ĆĐĹ°ÁöŔÇ ÇĘżä ťçÇ×ŔĚ ¸¸ÁˇľÇÁö žĘŔ˝: %s\n"
@@ -2871,18 +2837,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "ź­¸í: size(%d)+pad(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok Ç᥹סΠŔÎÇŘ %s (Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s ľđˇşĹ与¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "¸śżîĆŽľČ ĆÄŔϽýşĹŰŔÇ ¸ńˇĎŔť źöÁýÇĎ°í ŔÖ˝Ŕ´Ď´Ů\n"
 
@@ -2896,17 +2862,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "ĆĐĹ°ÁöżĄ ą×ˇě Ŕ̸§°ú id ¸ńˇĎŔĚ žř˝Ŕ´Ď´Ů (Ŕý´ë Ŕ̡¸°Ô ľÇžîź­´Â žČľË´Ď´Ů)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "´ŮŔ˝Ŕť ĂŁŔť źö žř˝Ŕ´Ď´Ů    %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "%s-%s-%s żĄ ŔÇÁ¸źş šŽÁŚ šßťý: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3430,6 +3396,27 @@ msgstr "URL Ć÷ĆŽ´Â šÝľĺ˝Ă źýŔÚŔĚžîžß ÇŐ´Ď´Ů\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s (Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== ŔçščÄĄ\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d ÁŚżÜ(exclude)  %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d ŔçščÄĄ %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "%s%s multilib °ćˇÎ¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "%s %s (Ŕť)¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "%s żĄź­ %s (Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "%s ľđˇşĹ与¸Ś %s (Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s żš (ĆÄŔĎŔĚ Ăß°ĄľĘ)\n"
diff --git a/po/no.po b/po/no.po
index 4b093e385..c9714664a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -825,7 +825,7 @@ msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke ĺpne %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
@@ -855,7 +855,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1464,11 +1464,11 @@ msgstr "ingen pakker\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "NEI"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "JA"
 
@@ -1599,7 +1599,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d ikke střttet\n"
@@ -2199,108 +2199,74 @@ msgstr " er i konflikt med %s-%s-%s\n"
 msgid "is needed by"
 msgstr " kreves av %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d omplasser %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "ekskluderer multilib-sti %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "eksluderer %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "relokerer %s til %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "relokerer katalog %s til %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke opprette %%%s %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binćr funnet\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kjřrer %s-skript (hvis noen)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke ĺ ĺpne %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
@@ -2348,90 +2314,90 @@ msgstr "pakken har verken fileier eller id-lister\n"
 msgid "can't query %s: %s\n"
 msgstr "kan ikke spřrre pĺ %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under ĺpning av %s: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "spřrring pĺ %s feilet\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "kildepakker i gammelt format kan ikke spřrres\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s inneholder ingen pakker\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakke utlřser %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakke krever %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakke gir %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s eies ikke av noen pakke\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2499,20 +2465,20 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
@@ -2843,18 +2809,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer katalog %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "henter liste over monterte filsystemer\n"
 
@@ -2866,17 +2832,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "mangler    %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "feilede avhengigheter:\n"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3384,6 +3350,21 @@ msgstr "url-port mĺ vćre et tall\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d omplasser %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "ekskluderer multilib-sti %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "eksluderer %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "relokerer %s til %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "relokerer katalog %s til %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s NO\n"
 #~ msgstr "%s: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 09a5edcb4..b10e9b4b8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Paweł Dziekoński <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -852,7 +852,7 @@ msgstr "Nie można odczytać ikony: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Nie można otworzyć %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie można zapisać pakietu: %s"
@@ -882,7 +882,7 @@ msgstr "Nie można odczytać ikony: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie można zapisać pakietu: %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1509,12 +1509,12 @@ msgstr "znaleziono %d pakietów\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie należy do żadnego pakietu\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "NIE DOBRZE"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1648,7 +1648,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi być 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obsługiwany\n"
@@ -2285,110 +2285,76 @@ msgstr " jest w konflikcie z %s-%s-%s\n"
 msgid "is needed by"
 msgstr " jest wymagany przez %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "Ten OS nie jest wspierany: %s"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "przesuwanie %s do %s\n"
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "wyłączanie %s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "wyłączanie %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "przesuwanie %s do %s\n"
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "przesuwanie %s do %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie można utworzyć %s"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie można zapisać do %s"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "spodziewany pakiet źródłowy a nie binarny"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pakiet źródłowy nie zawiera pliku .spec"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "uruchamianie skryptu postinstall (jeśli istnieje)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "wykonanie skryptu nie powiodło się"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "wykonanie skryptu nie powiodło się"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "użytkownik %s nie istnieje - użyto konta root"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s nie istnieje - użyto grupy root"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozpakowanie archiwum nie powiodło się %s%s: %s"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nie można otworzyć %s: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiodło się"
@@ -2437,92 +2403,92 @@ msgstr "pakiet nie ma ani właściciela pliku ani list id"
 msgid "can't query %s: %s\n"
 msgstr "nie można odwiązać %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiodło się\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "odpytywanie %s nie powiodło się\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mogą być odpytywane\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead nie powiodło się\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "odpytywanie pliku spec %s nie powiodło się, nie można interpretować\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s nie zawiera żadnych pakietów\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "żaden pakiet nie zahacza %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "żaden pakiet nie wymaga %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "żaden pakiet nie udostępnia %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, 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:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "błędny numer pakietu: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "numer rekordu pakietu: %d\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "nie można odczytać rekordu %d\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "błędny status pliku: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "Udostępniane zasoby:"
@@ -2592,20 +2558,20 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, fuzzy, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "       rpm {--version}"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "zależności pakietu %s nie zostały spełnione: %s\n"
@@ -2948,18 +2914,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Blok sygnatury: %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominięty z powodu flagi missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2977,17 +2943,17 @@ msgstr ""
 "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno się "
 "zdarzyć)"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "brak    %s\n"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Niespełnione zależności dla %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3507,6 +3473,29 @@ msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiodło się\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "Ten OS nie jest wspierany: %s"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "przesuwanie %s do %s\n"
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "wyłączanie %s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "wyłączanie %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "przesuwanie %s do %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "przesuwanie %s do %s\n"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "plik %s nie należy do żadnego pakietu\n"
 
diff --git a/po/pt.po b/po/pt.po
index de9ad579c..c967f7f96 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -823,7 +823,7 @@ msgstr "Năo consegui ler o cabeçalho de %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Năo consigo aceder ao %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Năo consegui gravar o pacote: %s\n"
@@ -853,7 +853,7 @@ msgstr "Năo consegui ler o conteúdo de %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Năo consegui escrever o conteúdo de %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
@@ -1464,12 +1464,12 @@ msgstr "nenhum pacote\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) adicionado ŕ cache de dependęncias.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "NĂO-OK"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1602,7 +1602,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "O tipo de dados %d năo é suportado\n"
@@ -2213,108 +2213,74 @@ msgstr " está em conflito com o %s-%s-%s\n"
 msgid "is needed by"
 msgstr " é necessário pelo %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== mudanças de local\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d excluir o %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d mudar de local %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "a exclur a directoria 'multilib' %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "a excluir o %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "a mudar o %s para %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "a mudar a directoria %s para %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "năo consigo criar o %s: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "năo consigo escrever em %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "o pacote de código-fonte năo contem um ficheiro .spec\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "a correr os programas de pós-instalaçăo (se existirem)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "a execuçăo do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "a execuçăo do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "o utilizador %s năo existe - a usar o root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "o grupo %s năo existe - a usar o root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "O %s falhou\n"
@@ -2362,91 +2328,91 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
 msgid "can't query %s: %s\n"
 msgstr "năo consigo pesquisar o %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "a pesquisa do %s falhou\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "os pacotes com código-fonte no formato antigo năo podem ser pesquisados\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "a pesquisa do ficheiro spec %s falhou, năo consigo analisar\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "nenhum pacote\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "o grupo %s năo contém nenhum pacote\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nenhum pacote activa o %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nenhum pacote precisa do %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nenhum pacote oferece o %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ficheiro %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "o ficheiro %s năo pertence a nenhum pacote\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "número de registo do pacote: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "o registo %d năo pôde ser lido\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s năo está instalado\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "ficheiro db inválido %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
@@ -2515,7 +2481,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2524,13 +2490,13 @@ msgstr ""
 "A dependęncia \"B\" precisa duma época (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "requisito %s-%s-%s do pacote năo satisfeito: %s\n"
@@ -2862,18 +2828,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "'Pad' ou preenchimento da assinatura: %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido ŕ opçăo missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "a excluir a directoria %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "a obter a lista dos sistemas de ficheiros montados\n"
 
@@ -2885,17 +2851,17 @@ msgstr "o pacote năo tem o nome de utilizador nem as listas de IDs (nunca deve o
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr "o pacote năo tem o nome do grupo nem as listas de IDs (nunca deve ocorrer)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "falta     %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Dependęncias năo satisfeitas para o %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3409,6 +3375,27 @@ msgstr "o porto do URL tem de ser um número\n"
 msgid "failed to create %s: %s\n"
 msgstr "năo consegui criar o %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== mudanças de local\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d excluir o %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d mudar de local %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "a exclur a directoria 'multilib' %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "a excluir o %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "a mudar o %s para %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "a mudar a directoria %s para %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s SIM (ficheiros adicionados)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 50baa6f6c..d71bb9d37 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -911,7 +911,7 @@ msgid "Could not open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -946,7 +946,7 @@ msgstr "No consegui abrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1620,11 +1620,11 @@ msgstr "pesquise todos os pacotes"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1763,7 +1763,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2406,138 +2406,78 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
-# , c-format
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "RPM verso %s\n"
-
-# , c-format
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "No consegui abrir: %s\n"
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
-# , c-format
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "RPM verso %s\n"
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "RPM verso %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-# , c-format
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "No consegui abrir: %s\n"
-
-# , c-format
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "no execute nenhum estgio"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
@@ -2588,94 +2528,94 @@ msgstr "no foi passado pacote para instalao"
 msgid "can't query %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
 # , c-format
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2747,20 +2687,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "no foi passado pacote para instalao"
@@ -3125,7 +3065,7 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3139,12 +3079,12 @@ msgstr ""
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM verso %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -3156,17 +3096,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "lista dependncias do pacote"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3698,6 +3638,52 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr "No consegui abrir o pipe tar: %s\n"
 
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "RPM verso %s\n"
+
+# , c-format
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "No consegui abrir: %s\n"
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "RPM verso %s\n"
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "RPM verso %s\n"
+
+# , c-format
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "No consegui abrir: %s\n"
+
 #, fuzzy
 #~ msgid "package %s conflicts: %s\n"
 #~ msgstr "no foi passado pacote para desinstalao"
diff --git a/po/ro.po b/po/ro.po
index b32ec3d03..96cdc5090 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1444,11 +1444,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1579,7 +1579,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2164,108 +2164,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2313,90 +2279,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2464,20 +2430,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2806,18 +2772,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2829,17 +2795,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index a41ffae9a..93657dd3a 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-12 17:47-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:662 lib/rpmds.c:821
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:662 lib/rpmds.c:821
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2397,11 +2363,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:790
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:820
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:844
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index ccaaeea4f..5f93bff43 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -834,7 +834,7 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ĐĹŇĹÚÁÇŇŐÚÉÔŘ ÚÁÇĎĚĎ×ĎË ĐĎÄĐÉÓÉ.\n"
 msgid "Could not open %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ: %s\n"
@@ -864,7 +864,7 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÓĎÄĹŇÖÉÍĎĹ ÉÚ %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ÓĎÄĹŇÖÉÍĎĹ × %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁĐÉÓÁÎ: %s\n"
@@ -1485,11 +1485,11 @@ msgstr "ÎĹÔ ĐÁËĹÔĎ×\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÄĎÂÁ×ĚĹÎĎ × ËĹŰ ÚÁ×ÉÓÉÍĎÓÔĹĘ\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "îĺT"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "äá"
 
@@ -1625,7 +1625,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() ÄĎĐŐÓÔÉÍ ÔĎĚŘËĎ ĎÄÉÎ ÜĚĹÍĹÎÔ ÔÉĐÁ RPM_STRING_TYPE\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉĐ ÄÁÎÎŮČ %d ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ\n"
@@ -2229,108 +2229,74 @@ msgstr " ËĎÎĆĚÉËÔŐĹÔ Ó %s-%s-%s\n"
 msgid "is needed by"
 msgstr " ÎŐÖĹÎ ÄĚŃ %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== ĐĹŇĹÍĹÝĹÎÉĘ\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d ÉÓËĚŔŢĹÎ %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d ĐĹŇĹÍĹÝĹÎÉĹ %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "ÉÓËĚŔŢÁĹÔÓŃ ÍÎĎÇĎÂÉÂĚÉĎÔĹŢÎŮĘ ĐŐÔŘ %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "ÉÓËĚŔŢÁĹÔÓŃ %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %%%s %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐÉÓÁÔŘ × %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "ĎÂÎÁŇŐÖĹÎ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ×ÍĹÓÔĎ ĎÖÉÄÁĹÍĎÇĎ ÉÓČĎÄÎĎÇĎ\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: ×ŮĐĎĚÎŃĹÔÓŃ ÓĂĹÎÁŇÉĘ %s (ĹÓĚÉ ĹÓÔŘ)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓĂĹÎÁŇÉŃ %s ÉÚ %s-%s-%s, waitpid() ×ĎÚ×ŇÁÔÉĚ %s\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓĂĹÎÁŇÉŃ %s ÉÚ %s-%s-%s, ËĎÄ ×ĎÚ×ŇÁÔÁ %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s ÓĎÄĹŇÖÉÔ %d ĆÁĘĚĎ×, test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: ĎŰÉÂËÁ ÓĂĹÎÁŇÉŃ %s (%d), %s-%s-%s ĐŇĎĐŐÓËÁĹÔÓŃ\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "ĐĎĚŘÚĎ×ÁÔĹĚŘ %s ÎĹ ÓŐÝĹÓÔ×ŐĹÔ - ÉÓĐĎĚŘÚŐĹÔÓŃ root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ÇŇŐĐĐÁ %s ÎĹ ÓŐÝĹÓÔ×ŐĹÔ - ÉÓĐĎĚŘÚŐĹÔÓŃ root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ŇÁÓĐÁËĎ×ËÁ ÁŇČÉ×Á ÎĹ ŐÄÁĚÁÓŘ%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " ÎÁ ĆÁĘĚĹ "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ĎŰÉÂËÁ ÎÁ ĆÁĘĚĹ %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ÎĹ ŐÄÁĚĎÓŘ: %s\n"
@@ -2378,91 +2344,91 @@ msgstr "ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ÓĐÉÓËĎ× ÎÉ ČĎÚŃĹ× ĆÁĘĚĎ×, ÎÉ ÉČ ID\n"
 msgid "can't query %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁĐŇĎÓÉÔŘ %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "ĎŰÉÂËÁ ÚÁĐŇĎÓÁ %s\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "ÚÁĐŇĎÓŮ Ë ÉÓČĎÄÎŮÍ ĐÁËĹÔÁÍ × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ĎŰÉÂËÁ ŢÔĹÎÉŃ ÓĐÉÓËÁ ĆÁĘĚĎ×: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "ÚÁĐŇĎÓ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ %s ÎĹ ŐÄÁĚÓŃ, ÎĹ×ĎÚÍĎÖÎĎ ŇÁÚĎÂŇÁÔŘ ĆÁĘĚ\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "ÎĹÔ ĐÁËĹÔĎ×\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ÇŇŐĐĐÁ %s ÎĹ ÓĎÄĹŇÖÉÔ ÎÉËÁËÉČ ĐÁËĹÔĎ×\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ×Ú×ĎÄÉÔ ÔŇÉÇÇĹŇ %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ÔŇĹÂŐĹÔ %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ĐŇĹÄĎÓÔÁ×ĚŃĹÔ %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ĆÁĘĚ %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ÎĹ×ĹŇÎŮĘ ÎĎÍĹŇ ĐÁËĹÔÁ: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ÎĎÍĹŇ ÚÁĐÉÓÉ ĐÁËĹÔÁ: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÚÁĐÉÓŘ %u\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "ÎĹ×ĹŇÎŮĘ ĆÁĘĚ ÂÁÚŮ ÄÁÎÎŮČ %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s YES (db provides)\n"
@@ -2531,7 +2497,7 @@ msgid "OK"
 msgstr "Oë"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2540,13 +2506,13 @@ msgstr ""
 "ÄĚŃ ÚÁ×ÉÓÉÍĎÓÔÉ \"B\" ÎŐÖÎĎ ŐËÁÚÁÔŘ \"epoch\" (ÔÁË ÖĹ ËÁË ÄĚŃ \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ÔŇĹÂĎ×ÁÎÉŃ ĐÁËĹÔÁ %s-%s-%s ÎĹ ŐÄĎ×ĚĹÔ×ĎŇĹÎŮ: %s\n"
@@ -2879,18 +2845,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "đĎÄĐÉÓŘ: ŇÁÚÍĹŇ(%d)+ÚÁĐĎĚÎĹÎÉĹ(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ĐŇĎĐŐÝĹÎ ÉÚ-ÚÁ ĆĚÁÇÁ missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "ĐĎĚŐŢĹÎÉĹ ÓĐÉÓËÁ ÓÍĎÎÔÉŇĎ×ÁÎÎŮČ ĆÁĘĚĎ×ŮČ ÓÉÓÔĹÍ\n"
 
@@ -2906,17 +2872,17 @@ msgstr ""
 "× ĐÁËĹÔĹ ÎĹÔ ÎÉ ÉÍĹÎ ÇŇŐĐĐ, ÎÉ ÓĐÉÓËÁ ÉČ ÉÄĹÎÔÉĆÉËÁÔĎŇĎ× (ÔÁËĎÇĎ ÎĹ ÄĎĚÖÎĎ "
 "ÂŮÔŘ)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "îĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ ÄĚŃ %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: ÎĹĐŇÁ×ÉĚŘÎÁŃ ĐĎÄĐÉÓŘ ĎÂĚÁÓÔÉ ÚÁÇĎĚĎ×ËÁ ĐÁËĹÔÁ\n"
@@ -3435,6 +3401,27 @@ msgstr "url ĐĎŇÔ ÄĎĚÖĹÎ ÂŮÔŘ ŢÉÓĚĎÍ\n"
 msgid "failed to create %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== ĐĹŇĹÍĹÝĹÎÉĘ\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d ÉÓËĚŔŢĹÎ %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d ĐĹŇĹÍĹÝĹÎÉĹ %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "ÉÓËĚŔŢÁĹÔÓŃ ÍÎĎÇĎÂÉÂĚÉĎÔĹŢÎŮĘ ĐŐÔŘ %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "ÉÓËĚŔŢÁĹÔÓŃ %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s YES (added files)\n"
diff --git a/po/sk.po b/po/sk.po
index f95455489..63049c5a5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -850,7 +850,7 @@ msgstr "Nie je možné prečítať ikonu: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je možné zapísať balík: %s"
@@ -880,7 +880,7 @@ msgstr "Nie je možné prečítať ikonu: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je možné zapísať balík: %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
@@ -1508,12 +1508,12 @@ msgstr "nájdených %d balíkov\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1647,7 +1647,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE počet musí byť 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovaný\n"
@@ -2282,110 +2282,76 @@ msgstr " koliduje s %s-%s-%s\n"
 msgid "is needed by"
 msgstr " je vyžadované %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "OS je vynechaný: %s"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "presúva sa %s do %s\n"
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "vynecháva sa %s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "vynecháva sa %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "presúva sa %s do %s\n"
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "presúva sa %s do %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie je možné zapísať do %s: "
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je možné zapísať do %s: "
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "očakávaný zdrojový balík, nájdený binárny"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "používateľ %s neexistuje - použije sa root"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - použije sa root"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvoriť %s: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
@@ -2434,92 +2400,92 @@ msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
 msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "otázka na %s zlyhala\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "nie je možné pýtať sa zdrojových balíkov v starom formáte\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "otázka na spec-súbor %s zlyhala, nie je možné analyzovať\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "nájdených %d balíkov\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje žiadne balíky\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "žiadny z balíkov nespúšťa %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "žiadny z balíkov nevyžaduje %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "žiadny z balíkov neposkytuje %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, 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:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "chybné číslo balíku: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "požaduje sa záznam číslo %d\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "záznam %d nie je možné prečítať\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "chybný stav súboru: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "Poskytuje:"
@@ -2589,20 +2555,20 @@ msgid "OK"
 msgstr "V PORIADKU"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, fuzzy, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "          rpm {--version}"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "požiadavka balíka %s nie je uspokojená: %s\n"
@@ -2945,18 +2911,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2974,17 +2940,17 @@ msgstr ""
 "v balíku chýba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa "
 "nikdy stať)"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "chýbajúce    %s\n"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nevyriešené závislosti pre %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3504,6 +3470,29 @@ msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvoriť %s\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "OS je vynechaný: %s"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "presúva sa %s do %s\n"
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "vynecháva sa %s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "vynecháva sa %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "presúva sa %s do %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "presúva sa %s do %s\n"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
 
diff --git a/po/sl.po b/po/sl.po
index 96d98e620..8b7d91ce8 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.202 2001/11/12 20:51:33 jbj Exp $
+# $Id: sl.po,v 1.203 2001/11/13 19:05:11 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -848,7 +848,7 @@ msgstr "Ikone %s ni možno prebrati: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Ni možno odpreti %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni možno zapisati paketa: %s"
@@ -878,7 +878,7 @@ msgstr "Ikone %s ni možno prebrati: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni možno zapisati paketa %s: %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1509,12 +1509,12 @@ msgstr "ni paketov\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1648,7 +1648,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "števec grabData() RPM_STRING_TYPE mora biti 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
@@ -2281,110 +2281,76 @@ msgstr " je v sporu z %s-%s-%s\n"
 msgid "is needed by"
 msgstr " potrebuje %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "OS je izključen: %s"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "premikanje %s v %s\n"
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "izključevanje datoteke %s%s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "izključevanje datoteke %s%s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "premikanje %s v %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "premiokanje imenika %s v %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ni možno ustvariti %s: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni možno"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "pričakovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "poganjanje ponamestitvenih skript (če obstajajo)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "skript se ni uspešno izvedel"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "skript se ni uspešno izvedel"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uporabnik %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "razširitev arhiva je bilo neuspešno%s%s: %s"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspešno odpiranje %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspešen"
@@ -2433,92 +2399,92 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 msgid "can't query %s: %s\n"
 msgstr "ni možno poizvedeti o %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspešno: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "poizvedba po %s je bila neuspešna\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni možna\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspešno: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "poizvedba po datoteki spec. %s je bila neuspešna, razčlemba ni možna\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "ni paketov\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s ne vsebuje nobenega paketa\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "noben paket ne proži %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "noben paket ne potrebuje %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "noben paket ne nudi %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ni del nobenega paketa\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neveljavna številka paketa: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "številka zapisa paketa: %d\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni možno prebrati\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni nameščen\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "poškodovana zbirka podatkov %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
@@ -2587,7 +2553,7 @@ msgid "OK"
 msgstr "V REDU"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2596,13 +2562,13 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
@@ -2943,18 +2909,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dolž. polnila : %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskočen zaradi manjkajoče zastavice OK\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izključevanje imenika %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "zbiranje seznama priklopljenih datotečnih sistemov.\n"
 
@@ -2970,17 +2936,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "manjka     %s\n"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3507,6 +3473,28 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspešno ustvarjanje %s: %s\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "OS je izključen: %s"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "premikanje %s v %s\n"
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "izključevanje datoteke %s%s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "izključevanje datoteke %s%s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "premikanje %s v %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "premiokanje imenika %s v %s\n"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s DA (dodane datoteke)\n"
 
diff --git a/po/sr.po b/po/sr.po
index de1b78c2d..df775604b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -833,7 +833,7 @@ msgstr "Ne mogu da upišem %s"
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upišem %s"
@@ -863,7 +863,7 @@ msgstr "Ne mogu da upišem %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1493,11 +1493,11 @@ msgstr "upit nad svim paketima"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2268,109 +2268,75 @@ msgstr " se sudara sa %s-%s-%s\n"
 msgid "is needed by"
 msgstr " je potreban paketu %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "Pribavljam %s\n"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "Ne mogu da otvorim datoteku %s: "
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "Pribavljam %s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "Pribavljam %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "greška kod kreiranja direktorijuma %s: %s"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "neuspelo izvršavanje skripta"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "neuspelo izvršavanje skripta"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket %s-%s-%s sadrži deljene datoteke\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s ne sadrži nijedan paket\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
@@ -2420,92 +2386,92 @@ msgstr "paket nema imena"
 msgid "can't query %s: %s\n"
 msgstr "greška: ne mogu da otvorim %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "Upit se ne može izvesti nad izvorni paketima u starom formatu\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s ne sadrži nijedan paket\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nijedan paket ne zahteva %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbeđuje %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "ne mogu da pročitam slog %d\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
@@ -2576,20 +2542,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s nije naveden u %s"
@@ -2934,18 +2900,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2957,17 +2923,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "nedostaje { posle %"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nezadovoljene međuzavisnosti za %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3490,6 +3456,26 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "Pribavljam %s\n"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "Ne mogu da otvorim datoteku %s: "
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "Pribavljam %s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "Pribavljam %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "greška kod kreiranja direktorijuma %s: %s"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "datoteka %s ne pripada nijednom paketu\n"
 
diff --git a/po/sv.po b/po/sv.po
index acf043923..6eb98477a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -825,7 +825,7 @@ msgstr "Kan inte läsa om signaturhuvud.\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
@@ -855,7 +855,7 @@ msgstr "Kan inte läsa last frĺn %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1470,11 +1470,11 @@ msgstr "inga paket\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "JA"
 
@@ -1609,7 +1609,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE antal mĺste vara 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
@@ -2212,109 +2212,75 @@ msgstr " stĺr i konflikt med %s-%s-%s\n"
 msgid "is needed by"
 msgstr " behövs av %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== omflyttningar\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d utesluter  %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d flyttar om %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "hoppar över multilib-sökväg %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "hoppar över %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "flyttar %s till %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "flyttar katalogen %s till %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan inte skapa %%%s %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "källpaket förväntades, fann binärpaket\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "källpaket innehĺller ingen .spec-fil\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kör (eventuellt) %s-skript\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "körning av %s-skript frĺn %s-%s-%s misslyckades, waitpid returnerade %s\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "körning av %s-skript frĺn %s-%s-%s misslyckades, slutstatus %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s har %d filer, test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "användare %s finns inte - använder root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupp %s finns inte - använder root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades pĺ fil %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
@@ -2362,91 +2328,91 @@ msgstr "paketet har varken filägare eller id-listor\n"
 msgid "can't query %s: %s\n"
 msgstr "kan inte frĺga %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades med att öppna %s: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "frĺga av %s misslyckades\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "källpaket i gammalt format gĺr inte att frĺga om\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: läsning av paketlista misslyckades: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "frĺga av specfil %s misslyckades, kan inte tolka\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "inga paket\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupp %s innehĺller inga paket\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "inga paketutlösare %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "inget paket behöver %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "inget paket tillhandahĺller %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tillhör inget paket\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paketpost nummer: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "post %u kunde inte läsas\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "felaktig db-fil %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db-tillhandahĺllande)\n"
@@ -2515,7 +2481,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2524,13 +2490,13 @@ msgstr ""
 "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
@@ -2864,18 +2830,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad pĺ grund av missingok-flagga\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar över katalogen %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "hämtar lista över monterade filsystem\n"
 
@@ -2890,17 +2856,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "paketet saknar bĺde gruppnamn och id-listor (detta borde aldrig inträffa)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "saknas     %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Ouppfyllda beroenden för %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n"
@@ -3415,6 +3381,27 @@ msgstr "url-port mĺste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== omflyttningar\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d utesluter  %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d flyttar om %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "hoppar över multilib-sökväg %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "hoppar över %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "flyttar %s till %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "flyttar katalogen %s till %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s JA (lade till filer)\n"
diff --git a/po/tr.po b/po/tr.po
index 9b93830d1..8686733f4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -836,7 +836,7 @@ msgstr "%s'den baţlýk okunamadý: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yazýlamadý: %s\n"
@@ -866,7 +866,7 @@ msgstr "%s'den payload okunamadý: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yazýlamadý: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yazýldý: %s\n"
@@ -1490,11 +1490,11 @@ msgstr "paket yok\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) Bađýmlýlar alanýna eklendi.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "EVET"
 
@@ -1629,7 +1629,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d veri türü desteklenmiyor\n"
@@ -2236,108 +2236,74 @@ msgstr " %s-%s-%s ile çeliţiyor\n"
 msgid "is needed by"
 msgstr " %s-%s-%s için gerekli\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== yeniden konumlama\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d %s'i dýţlýyor\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "multilib dosya yolu dýţlanýyor %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "%s %s dýţlanýyor\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "%s %s'e konumlanýyor\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "%s dizini %s de yeniden konumlanýyor\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s dosyasý oluţturulamýyor: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyasýna yazýlamaz %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken çalýţtýrýlabilir paketi bulundu\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyasý içermiyor\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s betiđi çalýţtýrýlýyor (varsa)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "%s betiđinin %s-%s-%s'den icrasý baţarýsýz, waitpid sonucu %s\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "%s betiđinin %s-%s-%s'den icrasý baţarýsýz, çýkýţta durum %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s betiđi baţarýsýz (%d), %s-%s-%s atlanýyor\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "kullanýcý %s yok - root kullanýlacak\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grup %s yok - root kullanýlacak\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "arţiv paketi açýlýrken baţarýsýz%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s baţarýsýz\n"
@@ -2385,91 +2351,91 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
 msgid "can't query %s: %s\n"
 msgstr "%s sorgulanamýyor: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s 'nin sorgulamasý baţarýsýzlýkla sonuçlandý\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma baţarýsýz: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s spec dosyasýnýn sorgulanmasý baţarýsýz, çözümlenemiyor\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "paket yok\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s gerektiren paket yok\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s sađlayan paket yok\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, 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:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "geçersiz paket numarasý: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paket kayýt numarasý: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "%u. kayýt okunamadý\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu deđil\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "db dosyasý %s hatalý\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s EVET (db sađlar)\n"
@@ -2538,7 +2504,7 @@ msgid "OK"
 msgstr "Tamam"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, fuzzy, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2547,13 +2513,13 @@ msgstr ""
 "\"B\" bađýmlýlýđý bir dönemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n"
@@ -2885,18 +2851,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Ýmza: boyut(%d)+iz(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok flamasýndan dolayý %s atlandý\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizini dýţlanýyor\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "bađlý dosya sistemlerinin listesi alýnýyor\n"
 
@@ -2911,17 +2877,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "paket hem grup ismi hem de kimlik listelerinden yoksun (bu hiç iyi deđil)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "eksik      %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "%s-%s-%s için tatmin edici olmayan bađýmlýlýklar: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: deđiţmez baţlýk alaný özet denetimi baţarýsýz\n"
@@ -3439,6 +3405,27 @@ msgstr "url portu bir sayý olmalý\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s oluţturulamadý: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== yeniden konumlama\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d %s'i dýţlýyor\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "multilib dosya yolu dýţlanýyor %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "%s %s dýţlanýyor\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "%s %s'e konumlanýyor\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "%s dizini %s de yeniden konumlanýyor\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s EVET (dosyalar eklendi)\n"
diff --git a/po/uk.po b/po/uk.po
index 432fb27ec..3aefd71bc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 432fb27ec..3aefd71bc 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 432fb27ec..3aefd71bc 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 432fb27ec..3aefd71bc 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""