54 files changed, 20784 insertions, 14246 deletions

diff --git a/CHANGES b/CHANGES
index 113963c67..db70953f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@
 	- free rpmrc when looping on --target arches (#127730).
 	- port to internal file-4.10 libmagic rather than libfmagic.
 	- fix: handle non-unique dirnames in rpmalAdd().
+	- integrate rpmgi "generic iterator" with query/verify.
 
 4.3.1 -> 4.3.2:
 	- use /etc/selinux/targeted/contexts/files/file_contexts for now.
diff --git a/file/Makefile.am b/file/Makefile.am
index 3e02ac807..300900dba 100644
--- a/file/Makefile.am
+++ b/file/Makefile.am
@@ -1,6 +1,6 @@
 # don't enforce GNU packaging standards
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-EXTRA_DIST = LEGAL.NOTICE MAINT PORTING
+EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README
 
 SUBDIRS = src magic doc
diff --git a/po/cs.po b/po/cs.po
index 38ad5c30e..bb998b47b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -63,10 +63,12 @@ msgid "Building for target %s\n"
 msgstr "Sestavuji pro cíl %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "parametr není RPM balíček\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "chyba při při čtení hlavičky balíčku\n"
 
@@ -83,155 +85,161 @@ msgstr "Volby dotazů (s -q or --query):"
 msgid "Verify options (with -V or --verify):"
 msgstr "Vollby kontroly (s -V or --verify):"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "Vollby kontroly (s -V or --verify):"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "Volby signatury:"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "Volby databáze:"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Sestavovací volby s [ <spec_soubor> | <tar_soubor> | <zdrojový_balíček> ]:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr "Volby pro Instalaci/Aktualizaci/Mazání:"
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
 msgstr "Společné volby pro všechny módy:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verze %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (c) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Tento program lze volně šířit podle podmínek GNU GPL."
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Interní chyba při zpracování parametrů (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "specifikovat lze jen jeden hlavní režim"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "najednou lze provést jen jeden typ dotazu či ověření"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "neočekávaný příznak pro dotaz"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "neočekávaný formát dotazu"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "neočekávaný zdroj dotazu"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "vynucena může být jen instalace, aktualizace, smazání zdrojových kódů a spec "
 "souboru"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "soubory mohou být přemístěny jen při instalaci balíčků"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate a --excludepath je možno použít jen při instalaci nových balíčků"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix je možno použít jen při instalaci nových balíčků"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametry pro --prefix musejí začínat znakem /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles může být použit jen při instalaci balíčků"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "použít lze jen jeden z parametrů --excludedocs a --includedocs"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb může být použit jen při instalaci a odstraňování balíčků"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -239,7 +247,7 @@ msgstr ""
 "volba pro potlačení skriptů může být použita jen při instalaci nebo při "
 "odstraňování balíčků"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -247,7 +255,7 @@ msgstr ""
 "volba pro potlačení triggerů může být použita jen při instalaci nebo "
 "odstraňování balíčků"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -255,13 +263,13 @@ msgstr ""
 "--nodeps může být použit jen při sestavování, rekompilaci, instalaci, "
 "odstraňování a kontrole"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test může být použit jen při instalaci, odstraňování a sestavování"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -269,83 +277,88 @@ msgstr ""
 "--root (-r) může být použit jen při instalaci, odstraňování, dotazech nebo "
 "znovuvytvoření databáze"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametry pro --root (-r) musejí začínat znakem /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "žádné soubory k podepsání\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "přístup k souboru %s se nezdařil\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp nenalezeno: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Vložte heslovou frázi: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Chybná heslová fráze\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Heslová fráze je v pořádku.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Špatná %%_signature spec v souboru maker.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign může být použit jen při sestavování balíčků"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "spuštění selhalo\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "ke znovusestavení nezadány žádné balíčky"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "pro sestavení nezadány žádné spec soubory"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "pro sestavení nezadány žádné tar soubory"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nezadány žádné balíčky pro instalaci"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "nezadány žádné balíčky pro instalaci"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "k dotazu nezadány žádné parametry"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezadány žádné balíčky"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "k dotazu nezadány žádné parametry"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Nelze otevřít dočasný soubor.\n"
 
@@ -424,176 +437,176 @@ msgstr "&& a || není podporováno pro řetězce\n"
 msgid "syntax error in expression\n"
 msgstr "chyba syntaxe ve výrazu\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK selhal: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Chybí '(' v %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Chybí ')' v %s(%s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Neplatný %s token: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Chybějící %s v %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Následuje neprázdný znak %s(): %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Špatná syntaxe: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Špatná práva spec: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Špatná práva adresáře: %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Neobvyklá délka locale: \"%.*s\" v %%lang(%s)\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Duplicitní locale %.*s v %%lang(%s)\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Dosažen limit pro %%docdir\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Jen jeden parametr pro %%docdir\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dva soubory na jednom řádku: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Soubor musí začínat na \"/\": %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nelze míchat speciální %%doc s ostatnímí formami: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Soubor uveden dvakrát: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolická linka ukazuje na BuildRoot: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Soubor nesouhlasí s prefixem (%s): %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Soubor nenalezen: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead selhalo\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLead selhalo\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Soubor potřebuje úvodní \"/\": %s\n"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob není dovolen: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Soubor nenalezen globem: %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nemohu otevřít %%files soubor %s: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "řádek: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Špatný soubor: %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Špatný vlastník/skupina: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "rozbalování archívu selhalo %s%s: %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Zpracovávám soubory: %s-%s-%s\n"
@@ -647,7 +660,7 @@ msgstr "zápis cpio_copy selhal: %s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "čtení cpio_copy selhalo: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nemohu otevřít PreIn soubor: %s\n"
@@ -657,126 +670,126 @@ msgstr "Nemohu otevřít PreIn soubor: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nemohu otevřít PreUn soubor: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nemohu otevřít PostIn soubor: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nemohu otevřít PostUn soubor: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nemohu otevřít VerifyScript soubor: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nemohu otevřít soubor se spuští (trigger): %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otevření %s: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: čtení %s: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek selhal: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s není RPM balíček\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: čtení hlavičky z %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nemohu přečíst hlavičku z %s: %s\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nemohu zapsat hlavičku do %s: %s\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "Špatná CSA data\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nemohu zapsat hlavičku do %s: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generuji podpis: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nemohu přečíst hlavičku z %s: %s\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevřít %s: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat balíček: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nemohu otevřít cíl pro podepsání %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nemohu přečíst hlavičku z %s: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nemohu zapsat hlavičku do %s: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nemohu přečíst payload z %s: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nemohu vygenerovat jméno souboru pro balíček %s: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nemohu vytvořit %s: %s\n"
@@ -821,17 +834,17 @@ msgstr "žádný popis v %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "řádek %d: Chyba při parsování %%description: %s\n"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "řádek %d: špatná volba %s: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "řádek %d: Příliš mnoho jmen: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "řádek %d: Balíček neexistuje: %s\n"
@@ -851,123 +864,128 @@ msgstr "řádek %d: Chyba při parsování %%files: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "řádek %d: Druhý seznam %%files\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architektura je vyřazena: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architektura není zahrnuta: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS je vyřazen: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS není zahrnut: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "Položka %s musí být v balíčku přítomna: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Duplikovaná položka %s v balíčku: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Nemohu otevřít ikonu %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Nemohu přečíst ikonu %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Neznámý typ ikony: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "řádek %d: Značka má jen jeden token: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "řádek %d: Počkozená značka: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "řádek %d: Prázdná značka: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "řádek %d: Nepřípustný znak '-' v %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot nemůže být \"/\": %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "řádek %d: Prefixy nesmí končit znakem \"/\": %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "řádek %d: Docdir musí začínat na '/': %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "řádek %d: Položka Epoch/Serial musí být číslo: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "řádek %d: Špatné určení %s: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "řádek %d: Špatný formát BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Interní chyba: Špatná značka: %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Špatná specifikace balíčku: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Balíček již existuje: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "řádek %d: Neznámá značka: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec soubor nemůže použít BuildRoot\n"
 
@@ -1048,82 +1066,87 @@ msgstr ""
 "řádek %d: Položky v závislostech musí začínat alfanumerickým znakem, '_' "
 "nebo '/': %s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "řádek %d: Jméno souboru není dovoleno: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "řádek %d: Jméno s verzí není dovoleno: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "řádek %d: Vyžadována verze: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "řádek %d: spouště (triggery) musí mít --: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "řádek %d: Chyba při parsování %s: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "řádek %d: jméno skriptu musí začínat na '/': %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "řádek %d: jméno skriptu musí začínat na '/': %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "řádek %d: Druhý %s\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "řádek %d: Chyba při parsování %%description: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "řádek %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nemohu otevřít %s: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Neuzavřený %%if\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean vrátil %d\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else bez počítečního %%if\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif bez počátečního %%if\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "poškozený příkaz %%include\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "Nenalezeny žádné kompatibilní architektury pro sestavení\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Balíček nemá žádné %%description: %s\n"
@@ -1253,20 +1276,20 @@ msgstr "nekontrolovat závislosti balíčků"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "generovat hlavičky balíčků kompatibilní s RPM verze 2 a 3"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "nekontrolovat závislosti balíčků"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "nekontrolovat architekturu balíčku"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "ověřit podpis v balíčku"
@@ -1365,57 +1388,68 @@ msgstr ""
 msgid " failed - "
 msgstr "selhal - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "balíček %s je již nainstalován"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "balíček %s je již nainstalován"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "Špatný soubor: %s: %s\n"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "žádné balíčky\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstraňuji %s-%s-%s \"%s\" z tsort relací.\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "========== ukládání tsort relací\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1423,27 +1457,27 @@ msgid ""
 msgstr ""
 "========== tsorting balíčků (pořadí, #předchůdce, #následovník, hloubka)\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== pouze úspěšné (pořadí dle prezentace)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "SMYČKA:\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokračuje tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(není číslo)"
 
@@ -1456,7 +1490,7 @@ msgstr "(není číslo)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(není číslo)"
@@ -1465,7 +1499,7 @@ msgstr "(není číslo)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "vynechat případné PGP podpisy"
@@ -1485,7 +1519,7 @@ msgstr "mntctl() nevrátil přípojné body: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "nemohu zjistit stav %s: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nemohu otevřít %s: %s\n"
@@ -1560,268 +1594,310 @@ msgstr "%s unlink %s selhal: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s vytvořen jako %s\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, c-format
+msgid "adding %d args from manifest.\n"
+msgstr ""
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nemohu vytvořit %s: %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "práce s balíčky verze 1 není podporována touto verzí RPM\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "tato verze RPM podporuje práci s balíčky s verzí <= 4\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "chyba při vytváření dočasného souboru %s\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "vypsat expanzi makra <výraz>+"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "číst <soubor:...> místo implicitního makro souboru"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "zakázat použití libio(3) API"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "odeslat stdout do <příkazu>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "použít <adr> jako adresář nejvyšší úrovně"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "zobrazit známé značky pro dotazy"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "zobrazit finální konfiguraci rpmrc a maker"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "poskytnout výstu s méně detaily"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "poskytnout detailnější výstup"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "vypsat používanou verzi rpm"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "ladit nástroj stavu souborů"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "ladit nástroj stavu souborů"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "ladit protokol datového toku"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Interní chyba při zpracování parametrů (%d) :-(\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "ladit nástroj stavu souborů"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "ladit nástroj stavu souborů"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "ladit rpmio I/O"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "ladit manipulaci s URL cache"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musí začínat znakem /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "přemístění musejí začínat znakem /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "přemístění musejí obsahovat ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "přemístění musejí mít za znakem = znak /"
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 #, fuzzy
 msgid "malformed rollback time/date stamp argument"
 msgstr "porušený rollback čas"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "dotaz/ověření balíčků ve skupině"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "nainstalovat všechny soubory i konfigurace, které by se jinak mohly vynechat"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1829,155 +1905,164 @@ msgstr ""
 "odstranit všechny balíčky odpovídající <balíčku> (obvykle se generuje chyba, "
 "specifikuje-li <balíček> více balíčků)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "nespouštět žádné skripty určené pro balíčky"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "přemístění souborů v nepřemístitelném balíčku"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr "uchovat smazané soubory přesunem do podadresáře"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "smazat (deinstalovat) balíček"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<balíček>"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "vypsat všechny konfigurační soubory"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "neinstalovat dokumentaci"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "přeskočit soubory s úvodní cestou <cesta> "
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<cesta>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "přemístění souborů v nepřemístitelném balíčku"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "zkratka pro --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "aktualizace balíčku jestliže je již nainstalován"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<soubor_balíčku>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "během instalace balíčku zobrazit dvojité křížky (dobré s -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "nekontrolovat architekturu balíčku"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "nekontrolovat operační systém balíčku"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "nekontrolovat volné místo na disku před instalací"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "nainstalovat dokumentaci"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "nainstalovat balíček"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "upravit databázi, ale neupravovat systém souborovů"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "nekontrolovat závislosti balíčků"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "nekontrolovat MD5 souborů v balíčku"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "vypsat všechny konfigurační soubory"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "pro vyřešení závislostí neměnit pořadí instalace balíčků"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "nespouštět žádné skripty aktivované tímto balíčkem"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nespouštět žádné skripty určené pro balíčky"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1985,476 +2070,493 @@ msgstr ""
 "aktualizovat na starou verzi balíčku (--force to dělá při aktualizacích "
 "automaticky)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "během instalace balíčku zobrazit procenta"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "přemístit soubory do <adr>, jsou-li přemístitelné"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<adresář>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "přemístit soubory ze <staré_cesty> do <nové_cesty>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<stará_cesta>=<nová_cesta>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr "uchovat smazané soubory pomocí přebalení"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "instalovat, i když balíček přepíše existující soubory"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "přeinstalovat, i když je již balíček přítomen"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 #, fuzzy
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "odinstalovat nové balíčky, reinstalovat staré balíčky zpět do data"
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr "<datum>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "neinstalovat ale sdělit, zda-li by to fungovalo či nikoli"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "aktualizace balíčku"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "dotázat/ověřit všechny balíčky"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "režim kontroly"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "dotaz/ověření balíčků vlastnícího soubor"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
+msgid "query/verify package(s) in group"
+msgstr "dotaz/ověření balíčků ve skupině"
+
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "dotaz/ověření balíčků vlastnícího soubor"
+msgid "query/verify a package file"
+msgstr "dotázat/ověřit všechny balíčky"
 
-#: lib/poptQV.c:103
-msgid "query/verify package(s) in group"
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "dotaz/ověření balíčků ve skupině"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "dotaz/ověření balíčků ve skupině"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "dotaz/ověření balíčků vlastnícího soubor"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "dotázat/ověřit všechny balíčky"
+msgid "query/verify package(s) with header identifier"
+msgstr "dotaz/ověření balíčků vlastnícího soubor"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "dotaz/ověření balíčků vlastnícího soubor"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "režim dotazů"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "dotaz/ověření balíčků vlastnícího soubor"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "dotaz na spec soubor"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<spec>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "dotaz/ověření balíčků ve skupině"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "dotaz na balíčky aktivované balíčkem"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "režim kontroly"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "dotaz/ověření balíčků vyžadujících závislost"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "dotaz/ověření balíčků poskytujících závislost"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "k dotazu nezadány žádné parametry"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "Špatná nebo nečitelná hlavička"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "vypsat všechny konfigurační soubory"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "vypsat všechny soubory s dokumentací"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "zobrazit základní informace o souborech"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "vypsat soubory v balíčku"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr "vynechat %%ghost soubory"
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr "vynechat %%license soubory"
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr "vynechat %%readme soubory"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "použij následující formát dotazů"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "nahradit i18n sekce do spec souboru"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "zobrazit stav vypsaných souborů"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "nekontrolovat velikost souborů"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "nekontrolovat cesty symbolických linek"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "nekontrolovat vlastníka souborů"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "nekontrolovat skupinu souborů"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "nekontrolovat čas změny souboru"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "nekontrolovat mód souborů"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "nekontrolovat soubory v balíčku"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "nekontrolovat soubory v balíčku"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "nekontrolovat závislosti balíčků"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "nespouštět %verifyscript (pokud existuje)"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "nekontrolovat SHA1 digest v hlavičce"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "nekontrolovat MD5 souborů v balíčku"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "podepsat balíček (zahodit aktuální podpis)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "ověřit podpis v balíčku"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podepsat balíček (zahodit aktuální podpis)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 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:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "zdrojový balíček neobsahuje .spec soubor\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: spouštím %s skript(y) (pokud existují)\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: scriptlet %s selhal (%d), přeskakuji %s-%s-%s\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, 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:1423
+#: lib/psm.c:1606
 #, 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:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nemohu přečíst hlavičku z %s: %s\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalování archívu selhalo %s%s: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otevřít %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "nesprávný formát: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(neobsahuje žádné soubory)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normální      "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "nahrazen      "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "neinstalován  "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "sdílen v síti "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(chybí stav)  "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznámý %3d) "
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "balíček nemá vlastníka souboru ani seznamy id\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "balíček nemá vlastníka souboru ani seznamy id\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "otevření %s selhalo: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "dotaz na %s se nezdařil\n"
-
-#: lib/query.c:453
-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:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "žádný balíček neaktivuje %s\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "žádné balíčky\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "neznámá značka"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje žádné balíčky\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "žádný balíček neaktivuje %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "nemohu zjistit stav %s: %s\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "žádný balíček neaktivuje %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "žádný balíček nevyžaduje %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "žádný balíček neposkytuje %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "soubor %s nevlastní žádný balíček\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neplatné číslo balíčku: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "záznam balíčku číslo: %u\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "záznam %u nelze přečíst\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíček %s není nainstalován\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "Špatný soubor: %s: %s\n"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s ANO (přidáno poskytuje)\n"
@@ -2553,15 +2655,15 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr "NE "
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr "ANO"
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2570,13 +2672,13 @@ msgstr ""
 "Závislost \"B\" potřebuje období (předpokládáno stejné jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n"
@@ -2586,159 +2688,188 @@ msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 #, fuzzy
 msgid "========== relocations\n"
 msgstr "========== ukládání tsort relací\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vyřazen: %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s vytvořen jako %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Provádění(%s): %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "Provádění(%s): %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "otevření %s selhalo: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "neznámá značka"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "chybné závislosti při sestavování:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "nezadány žádné balíčky pro instalaci"
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "aktualizace balíčku"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Hledám   %s: (použit %s)...\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, fuzzy, c-format
 msgid "Retrieving %s\n"
 msgstr "RPM verze %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, fuzzy, c-format
 msgid " ... as %s\n"
 msgstr "%s uloženo jako %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "neinstalován  "
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<zdrojový balíček>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "cesta %s v balíčku %s není přemístitelná"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "nainstalovat balíček"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "žádný balíček neaktivuje %s\n"
+
+#: lib/rpminstall.c:638
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "vytvoření zdrojového a binárního balíčku z <tar_soubor>"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "chybné závislosti při sestavování:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "nainstalovat balíček"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nemohu vytvořit %s: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, fuzzy, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "Položka %s musí být v balíčku přítomna: %s\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nemohu vytvořit %s: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, fuzzy, c-format
 msgid "Installing %s\n"
 msgstr "řádek: %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "RPM verze %s\n"
+
 #: lib/rpmlead.c:56
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
@@ -2753,7 +2884,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2780,6 +2911,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- není podporováno pro řetězce\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2855,175 +2991,230 @@ msgstr " koliduje s %s-%s-%s\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznámá chyba %d vznikla při manipulaci s balíčkem %s"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "Chybí '(' v %s %s\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Špatná práva adresáře: %s(%s)\n"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "nemohu zjistit stav %s: %s\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "Sestavuji cílové platformy: %s\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "nemohu otevřít %s: %s\n"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "nemohu vytvořit %s: %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "řádek %d: Špatný formát BuildArchitecture: %s\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "nemohu zjistit stav %s: %m\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, fuzzy, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznámý typ ikony: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "nemohu znovu otevřít payload: %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nemohu otevřít %s: %s\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nemohu otevřít RPM databázi v %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "neplatné číslo balíčku: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Chybí '(' v %s %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "neplatné číslo balíčku: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "nemohu otevřít RPM databázi v %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "řádek: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "RPM verze %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "získávám seznam připojených systémů souborů\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "Provádění(%s): %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3040,6 +3231,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3064,6 +3256,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3136,6 +3329,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3160,44 +3356,167 @@ msgstr "Velikost hlavičky je přiliš velká"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "nekontrolovat SHA1 digest v hlavičce"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynechat případné MD5 součty"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "žádný balíček neaktivuje %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<zdrojový balíček>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<zdrojový balíček>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "chyba při při čtení hlavičky balíčku\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3206,11 +3525,15 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3219,7 +3542,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3227,13 +3550,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "chybí { po %"
 
 #: lib/verify.c:437
@@ -3266,136 +3613,136 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nemohu vytvořit %s: %s\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 #, fuzzy
 msgid "shared"
 msgstr "sdílen v síti "
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "chybí { po %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "po %{ chybí }"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "prázdný formát značky"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "prázdné jméno značky"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "neznámá značka"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "na konci pole očekáváno ]"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "neočekávaná ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "neočekávaná }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "ve výrazu očekáván ?"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "ve výrazu je po ? očekávána {"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "ve výrazu je očekávána }"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "v podvýrazu je po ? očekávána :"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "ve výrazu je po : očekávána {"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "na konci výrazu je očekáváno |"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3421,327 +3768,327 @@ msgstr "zkontrolovat databázové soubory"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "generovat hlavičky balíčků kompatibilní s RPM verze 2 a 3"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nemohu otevřít RPM databázi v %s\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "nemohu otevřít RPM databázi v %s\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraňuji %s-%s-%s \"%s\" z tsort relací.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraňuji %s-%s-%s \"%s\" z tsort relací.\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu vytvořit databázi z existující databáze"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Nelze přejmenovat %s na %s: %m\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznámý typ ikony: %s\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Glob není dovolen: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Nemohu otevřít cíl pro podepsání %s: %s\n"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 #, fuzzy
 msgid "File not found on server"
 msgstr "Soubor nenalezen: %s\n"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "neočekávaný zdroj dotazu"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3752,6 +4099,7 @@ msgid "(no error)"
 msgstr "(chyba: 0x%x)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 #, fuzzy
 msgid "fatal error: "
@@ -3773,95 +4121,62 @@ msgstr ""
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "řádek %d: Položka Epoch/Serial musí být číslo: %s\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "řádek %d: Položka Epoch/Serial musí být číslo: %s\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "nemohu zjistit stav %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "ověřit podpis v balíčku"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
+#: tools/rpmcache.c:519
 #, fuzzy
-msgid "don't change directories"
-msgstr "chyba při vytváření dočasného souboru %s\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-#, fuzzy
-msgid "Common options for all rpm modes and executables:"
-msgstr "Společné volby pro všechny módy:"
+msgid "File tree walk options:"
+msgstr "Volby signatury:"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: otevření selhalo: %s\n"
@@ -3958,6 +4273,27 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "Společné volby pro všechny módy:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles může být použit jen při instalaci balíčků"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "řádek %d: Jméno souboru není dovoleno: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "instalovat, i když balíček přepíše existující soubory"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "dotaz na %s se nezdařil\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "nelze provést dotaz na zdrojové balíčky starého formátu\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "žádné balíčky\n"
+
 #, fuzzy
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "Provádění(%s): %s\n"
@@ -3995,10 +4331,6 @@ msgstr ""
 #~ msgid "Old PGP signature\n"
 #~ msgstr "vynechat případné PGP podpisy"
 
-#, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "%s: spouštím %s skript(y) (pokud existují)\n"
-
 #~ 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"
diff --git a/po/da.po b/po/da.po
index 32d05dba4..5c943119e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 0.9alpha\n"
 
 #: build.c:40
@@ -64,10 +64,12 @@ msgid "Building for target %s\n"
 msgstr "Opbygger for mĺl %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "parameter er ikke en RPM-pakke\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "fejl ved lćsning af hovedet pĺ pakke\n"
 
@@ -84,165 +86,171 @@ msgstr "Forespřrgselstilvalg (med -q eller --query):"
 msgid "Verify options (with -V or --verify):"
 msgstr "Verifikationstilvalg (med -V eller --verify):"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "Verifikationstilvalg (med -V eller --verify):"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "Signaturtilvalg"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "Databasetilvalg:"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Opbygningstilvalg med [ <spec-fil> | <tararkiv> | <kildepakke> ]:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
 msgstr "Fćlles tilvalg for alle rpm-tilstande:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Dette program kan frit distribueres under betingelserne i GNU GPL"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "kun ét hovedtilvalg kan angives"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "kun én af forespřrgsel/verificér kan udfřres ad gangen"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "uventet forespřrgselsflag"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "uventet forespřrgselsformat"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "uventet forespřrgselskilde"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omrokeres under installation"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate og --excludepath kan kun bruges, nĺr nye pakker installeres"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun bruges, nĺr nye pakker installeres"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametre til --prefix skal starte med et /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun angives ved installation"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun angives ved installation"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles kan kun angives ved installation"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan kun angives ved installation"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan kun angives ved installation"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan kun angives ved installation"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "kun én af --excludedocs og --includedocs kan angives"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan kun angives ved installation"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan kun angives ved installation"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan kun angives ved installation"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan kun angives ved installation"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan kun angives ved installation"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--notriggers kan kun angives ved installation og sletning af pakker"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -250,13 +258,13 @@ msgstr ""
 "--nodeps kan kun angives ved opbygning, genopbygning, genoversćttelse, "
 "installation, sletning og verifikation"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test kan kun angives ved installation, sletning og opbygning"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -264,83 +272,88 @@ msgstr ""
 "--root (-r) kan kun angives ved installation, sletning, forespřrgsel og "
 "genopbygning af databasen"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parameteren til --root (-r) skal starte med et /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "ingen filer at underskrive\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan ikke tilgĺ filen %s\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp ikke fundet: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Indtast adgangskode: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Adgangskode ikke godkendt\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Adgangskode godkendt.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Ugyldig angivelse af %%_signature i makrofil.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign kan kun bruges ved pakkeopbygning"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "eksekvering mislykkedes\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler angivet til genopbygning"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "ingen spec-fil angivet til opbygning"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "ingen tar-arkiver angivet til opbygning"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "ingen parametre angivet ved forespřrgsel"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "ingen parametre angivet ved verifikation"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved forespřrgsel"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke ĺbne midlertidig fil.\n"
 
@@ -419,176 +432,176 @@ msgstr "&& og || understřttes ikke for strenge\n"
 msgid "syntax error in expression\n"
 msgstr "syntaksfejl i udtryk\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK-fejl: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Manglende '(' i %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Manglende ')' i %s %s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ugyldigt %s-symbol: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Manglende '(' i %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Ikke-mellemrum efterfřlger %s(): %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Ugyldig syntaks: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Ugyldig tilstandsangivelse: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Ugyldig dirmode-spec: %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Anormal locale-lćngde: \"%.*s\" i %%lang(%s)\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Dobbelt locale %.*s i %%lang(%s)\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Trćfningsgrćnse for %%docdir\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Kun et parameter for %%docdir\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "To filer pĺ én linie: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Fil skal begynde med \"/\": %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan ikke blande special-%%doc med andre former: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fil angivet to gange: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolsk lćnke peger pĺ BuildRoot: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Fil passer ikke til prćfiks (%s): %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fil ikke fundet: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Fil krćver foranstillet \"/\": %s\n"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linie %d: Filnavn ikke tilladt: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Fil ikke fundet med glob: %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke ĺbne '%%files'-fil %s: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "linie: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil: %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig ejer/gruppe: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Gennemlřber filer: %s-%s-%s\n"
@@ -644,7 +657,7 @@ msgstr "cpio_copy-skrivning mislykkedes: %s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy-lćsning mislykkedes: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunne ikke ĺbne 'PreIn'-fil: %s\n"
@@ -654,126 +667,126 @@ msgstr "Kunne ikke ĺbne 'PreIn'-fil: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunne ikke ĺbne 'PreUn'-fil: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunne ikke ĺbne 'PostIn'-fil: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunne ikke ĺbne 'PostUn'-fil: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunne ikke ĺbne 'VerifyScript'-fil: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Kunne ikke ĺbne skriptfilen Trigger: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: ĺbn %s: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: lćs %s: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s er ikke nogen RPM-pakke\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: lćser hoved fra %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke lćse hoved fra %s: %s\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke lćse hoved fra %s: %s\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke ĺbne %s: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke ĺbne sigtarget %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke lćse hoved fra %s: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke lćse pakkeindhold fra %s: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -818,17 +831,17 @@ msgstr "ingen beskrivelse i %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linie %d: Fejl ved tolkning af %%description: %s\n"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linie %d: Ugyldigt tilvalg %s: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "line %d: For mange navne: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "line %d: Pakken eksisterer ikke: %s\n"
@@ -848,123 +861,128 @@ msgstr "linie %d: Fejl ved tolkning af %%files: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "linie %d: Anden '%%files'-liste\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Arkitekturen er ekskluderet: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Arkitekturen er ikke inkluderet: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS er ekskluderet: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS is ikke inkluderet: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "'%s'-felt skal vćre tilstede i pakke : %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Flere '%s'-indgange i pakke: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Kunne ikke ĺbne ikon %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Kunne ikke lćse ikon %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Ukendt ikontype: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "linie %d: Ugyldigt tilvalg %s: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linie %d: Forkert udformet mćrke: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linie %d: Tomt mćrke: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "linie %d: Ugyldigt tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot kan ikke vćre \"/\": %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "linie %d: Prćfikser kan ikke ende pĺ \"/\": %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linie %d: Docdir skal starte med '/': %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "linie %d: Epoch/Serial-felter skal vćre et nummer: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linie %d: Ugyldig %s: angivere: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linie %d: Ugyldigt 'BuildArchitecture'-format: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern fejl: Falsk mćrke %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ugyldig pakkeangivelse: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakken eksisterer allerede: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linie %d: Ukendt mćrke: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec-fil kan ikke bruge BuildRoot\n"
 
@@ -1045,85 +1063,90 @@ msgstr ""
 "linie %d: Afhćngigheds-symbol skal starte med alfanumerisk, '_' eller '/': %"
 "s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "linie %d: Filnavn ikke tilladt: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "linie %d: Filnavn med version ikke tilladt: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "linie %d: Version krćves %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "linie %d: udlřsere skal have --: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "linie %d: Fejl under tolkning af %s: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "linie %d: skriptprogram skal starte med '/': %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "linie %d: skriptprogram skal starte med '/': %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "linie %d: Anden %s\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "linie %d: Fejl ved tolkning af %%description: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "linie %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 "Kunne ikke ĺbne %s: %s\n"
 "\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Ikke-lukket %%if\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerer %d\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Fik et %%else uden et %%if\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Fik et %%endif uden et %%if\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "forkert udfřrt '%%include'-kommando\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen arkitekturer, der kan opbygges\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakke har ingen %%description: %s\n"
@@ -1253,20 +1276,20 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "generér pakkehoved(er), der er kompatible med (gamle) rpm[23]-indpakninger"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "undlad at tjekke pakkers afhćngighedskrav"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "tjek ikke pakkens arkitektur"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verificér pakkesignatur"
@@ -1366,83 +1389,94 @@ msgstr ""
 msgid " failed - "
 msgstr " mislykkedes - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "pakken %s er allerede installeret"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s JA (rpmrc tilfřrer)\n"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s JA (rpmlib tilfřrer)\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s JA (db tilfřrer)\n"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "ingen pakker\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== kun efterfřlgere (prćsentationsrćkkefřlge)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "LŘKKE:\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsćtter tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(ikke et tal)"
 
@@ -1455,7 +1489,7 @@ msgstr "(ikke et tal)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(ikke et tal)"
@@ -1464,7 +1498,7 @@ msgstr "(ikke et tal)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "overspring eventuelle PGP-signaturer"
@@ -1484,7 +1518,7 @@ msgstr "mntctl() returnerede ingen monteringspunkter: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "kunne ikke finde %s: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunne ikke ĺbne %s: %s\n"
@@ -1558,265 +1592,309 @@ msgstr "ĺbning af %s mislykkedes %s\n"
 msgid "%s created as %s\n"
 msgstr "%s oprettet som %s\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "tilfřjer %d indgange til '%s'-indekset.\n"
+
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil %s\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "indpakningsversion 1 understřttes ikke af denne udgave af RPM\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "kun indpakninger med hovedversion <= 4 understřttes af denne udgave af RPM\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature mislykkedes\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen tilgćngelig signatur\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr ""
+"opretter kataloget %s\n"
+"\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "udlćs makroudvidelse af <udtryk>+"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "lćs <fil:...> i stedet for standard makrofil(er)"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "undlad at benytte libio(3)-API"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "send standard-ud til <kmd>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "brug <katalog> som topniveau-katalog"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "vis kendte forespřrgselsmćrker"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "vis den endelige rpmrc og makrokonfiguration"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "medtag mindre detaljerede oplysninger"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "medtag mere detaljerede oplysninger"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "vis versionen af rpm som benyttes"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "aflus protokol-datastrřm"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "aflus rpmio I/O"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "aflus URL-bufferhĺndtering"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "udeladte stier skal begynde med et /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "omrokeringer skal starte med et /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "omrokeringer skal indeholde et ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "i omrokeringer skal = efterfřlges af /"
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "forespřrg/verificér pakke(r) i gruppen"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "installér alle filer -- ogsĺ konfigurationsfiler, der ellers skulle "
 "overspringes"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1824,161 +1902,170 @@ msgstr ""
 "fjern alle pakker, som passer med <pakke> (normalt ville det medfřre en "
 "fejl, hvis <pakke> angav flere pakker)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "udfřr ingen pakkespecifikke skripter"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "omdirigér filer i ikke-omdirigérbar pakke"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "slet (afinstallér) pakke"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 #, fuzzy
 msgid "<package>+"
 msgstr "<pakke>"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "vis alle konfigurationsfiler"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "installér ikke dokumentation"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "overspring filer med foranstillet komponent <sti> "
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "omdirigér filer i ikke-omdirigérbar pakke"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "forkortelse for --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "opgradér pakke, hvis den allerede er installeret"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<pakkefil>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "udlćs #'er efterhĺnden som pakken installeres (virker sammen med -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "tjek ikke pakkens arkitektur"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "tjek ikke pakkens operativsystem"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "tjek ikke om der er diskplads, fřr der installeres"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "installér dokumentation"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "installér pakke"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "opdatér databasen, men rřr ikke filsystemet"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "undlad at tjekke pakkers afhćngighedskrav"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "vis alle konfigurationsfiler"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "ćndr ikke pakkernes installationsrćkkefřlge for at opfylde afhćngigheder"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "udfřr ikke eventuelle skripter"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "udfřr ikke eventuelle skripter"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "udfřr ikke eventuelle skripter"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "udfřr ikke eventuelle skripter"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "udfřr ikke smĺskripter, der mĺtte udlřses af denne pakke"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "udfřr ingen pakkespecifikke skripter"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "udfřr ingen installations-smĺskripter"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "udfřr ingen installations-smĺskripter"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "udfřr ingen installations-smĺskripter"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1986,486 +2073,503 @@ msgstr ""
 "opgradér til en ćldre version af pakken (--force gřr ikke dette automatisk "
 "ved opgraderinger)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "vis procenter efterhĺnden som pakken installeres"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "omdirigér pakken til <katalog>, hvis omdirigérbar"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<katalog>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "omdirigér filer fra <gammelsti> til <nysti>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "<gammelsti>=<nysti>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "intallér selvom pakken erstatter installerede filer"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "geninstallér hvis pakken allerede er installeret"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "installér ikke, men fortćl om det ville lykkes eller ej"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "opgradér pakke"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "forespřrg/verificér alle pakker"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "rpm verifikationstilstand"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "forespřrg/verificér pakke(r), der ejer filen"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
+msgid "query/verify package(s) in group"
+msgstr "forespřrg/verificér pakke(r) i gruppen"
+
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "forespřrg/verificér pakke(r), der ejer filen"
+msgid "query/verify a package file"
+msgstr "forespřrg/verificér alle pakker"
 
-#: lib/poptQV.c:103
-msgid "query/verify package(s) in group"
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "forespřrg/verificér pakke(r) i gruppen"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "forespřrg/verificér pakke(r) i gruppen"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "forespřrg/verificér pakke(r), der ejer filen"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "forespřrg/verificér alle pakker"
+msgid "query/verify package(s) with header identifier"
+msgstr "forespřrg/verificér pakke(r), der ejer filen"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "forespřrg/verificér pakke(r), der ejer filen"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "rpm forespřrgselstilstand"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "forespřrg/verificér pakke(r), der ejer filen"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "forespřrg en spec-fil"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<spec>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "forespřrg/verificér pakke(r) i gruppen"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "forespřrg pakke(r), der udlřses af pakken"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "rpm verifikationstilstand"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "forespřrg/verificér pakke(r), der stiller et krav"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "forespřrg/verificér pakke(r), der tilfredsstiller et krav"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "ingen parametre angivet ved forespřrgsel"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: kan ikke lćse hoved ved 0x%x\n"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "vis alle konfigurationsfiler"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "vis alle dokumentationsfiler"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "vis grundlćggende filinformation"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "vis liste over filerne i pakken"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "brug fřlgende forespřrgselsformat"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "erstat i18n-sektioner i spec-fil"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "vis filernes status"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "undlad at tjekke pakkers afhćngighedskrav"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "udfřr ikke eventuelt %verifyscript"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "underskriv en pakke (slet nuvćrende signatur)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verificér pakkesignatur"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "underskriv en pakke (slet nuvćrende signatur)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 #, fuzzy
 msgid "generate signature"
 msgstr "generér PGP/GPG-signatur"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binćr fundet\n"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "křrer postinstallations-skript (hvis det findes)\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "overspringer installation af %s-%s-%s, %%pre-smĺskript fejlede rc %d\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 "křrsel af smĺskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pakke: %s-%s-%s filer test = %d\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Kunne ikke lćse hoved fra %s: %s\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke ĺbne %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ugyldigt format: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(indeholder ingen filer)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "erstattet     "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "ej installeret"
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "ej delt       "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(ingen status)"
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ukendt %3d)  "
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "ĺbning af %s mislykkedes %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "forespřrgsel af %s mislykkedes\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "pakke med gammelt kildeformat kan ikke forespřrges\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "ingen pakker udlřser %s\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "ingen pakker\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "ukendt mćrke"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s indeholder ingen pakker\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakker udlřser %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Kunne ikke lćse %s: %s.\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "ingen pakker udlřser %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakker krćver %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakker tilfřrer %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tilhřrer ingen pakke\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "pakkens post-nummer: %u\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "post %d kunne ikke lćses\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (tilfřjede 'provide')\n"
@@ -2563,16 +2667,16 @@ msgstr ")"
 msgid "OK"
 msgstr "O.K."
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2581,13 +2685,13 @@ msgstr ""
 "\"B\"-afhćngighed krćver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
@@ -2597,158 +2701,187 @@ msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s oversprunget grundet manglende ok-flag\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr "========== gemmer omrokeringer\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ekskluderer %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omrokerer %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ekskluderer %s %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "omrokerer %s til %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "omrokerer kataloget %s til %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "ĺbning af %s mislykkedes %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "ukendt mćrke"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "afhćngighedskrav, der ikke kunne imřdekommes:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr "Forbereder pakker til installation..."
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 #, fuzzy
 msgid "Repackaging..."
 msgstr "Forbereder..."
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 #, fuzzy
 msgid "Upgrading..."
 msgstr "Forbereder..."
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "opgradér pakke"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Finder %s: (benytter %s)...\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Modtager %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "overspringer %s - overfřrsel mislykkedes - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kunne ikke installeres\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<kildepakke>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "pakke %s kan ikke omrokeres\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "installerer binćrpakker\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fejl ved lćsning fra filen %s\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "filen %s krćver en nyere version af RPM\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "ingen pakker udlřser %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fandt %d kilde- og %d binćrpakker\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "afhćngighedskrav, der ikke kunne imřdekommes:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "installerer binćrpakker\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kunne ikke ĺbne fil %s: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" angiver flere pakker\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kunne ikke ĺbne %s: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "Modtager %s\n"
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2763,7 +2896,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2790,6 +2923,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- understřttes ikke for strenge\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2866,179 +3004,234 @@ msgstr " skaber konflikt med %s-%s-%s\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ukendt fejl %d under arbejdet med pakken %s"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "manglende andet ':' ved %s:%d\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manglende navn pĺ arkitektur ved %s:%d\n"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ufćrdig datalinie ved %s:%d\n"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "For mange parametre pĺ datalinie ved %s:%d\n"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Ugyldigt arch/os-tal: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ufuldstćndig standardlinie ved %s:%d\n"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "For mange parametre i standardlinie ved %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Kunne ikke lćse %s: %s.\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "manglende  ':' (fandt 0x%02x) ved %s:%d\n"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manglende parameter til %s ved %s:%d\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s-udvidelse mislykkedes ved %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan ikke ĺbne %s ved %s:%d: %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manglende arkitektur for %s ved %s:%d\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ugyldig tilvalg '%s' ved %s:%d\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 "Ukendt system: %s\n"
 "\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontakt venligst rpm-list@redhat.com (pĺ engelsk)\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan ikke udfolde %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Kunne ikke lćse %s, HOME er for stor.\n"
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke ĺbne %s for lćsning: %s.\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kunne ikke ĺbne Packages-database i %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Manglende '(' i %s %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "kan ikke ĺbne rpm-database i %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "linie: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr ""
 "kilder i: %s\n"
 "\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "henter liste over monterede filsystemer\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "omrokerer %s til %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3055,6 +3248,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3079,6 +3273,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3146,6 +3341,9 @@ msgstr "Fik %d byte GPG-signatur\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3170,44 +3368,167 @@ msgstr "Hovedstřrrelse er for stor"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "overspring eventuelle MD5-signaturer"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer kataloget %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "kildepakke forventet, binćr fundet\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "ingen pakker udlřser %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<kildepakke>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<kildepakke>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "fejl ved lćsning af hovedet pĺ pakke\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3216,11 +3537,16 @@ msgstr "ekskluderer kataloget %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+#, fuzzy
+msgid "running pre-transaction scripts\n"
+msgstr "křrer prćinstallations-skript (hvis det findes)\n"
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3229,7 +3555,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3237,13 +3563,38 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+#, fuzzy
+msgid "running post-transaction scripts\n"
+msgstr "křrer skriptet postuninstall (hvis det findes)\n"
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "manglende  %s"
 
 #: lib/verify.c:437
@@ -3276,135 +3627,135 @@ msgstr "fjernede db-miljř  %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "ĺbner   db-miljř  %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "lukkede db-indeks %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "lukkede db-indeks %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "ĺbner   db-indeks %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan ikke opnĺ %s lĺs pĺ %s/%s\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "eksklusiv"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "delt"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "lĺste   db-index  %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, fuzzy, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "ukendt db-tilvalg: \"%s\" ignoreret\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s har ugyldig talvćrdi, overspringes\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s har for stor eller lille 'long'-vćrdi, overspringes\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s har for stor eller lille heltalsvćrdi, overspringes\n"
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "manglende { efter %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "manglende } efter %{"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "tomt mćrkeformat"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "tomt mćrkenavn"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "ukendt mćrke"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "] forventet ved slutningen af tabel"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "uventet ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "uventet }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "? forventet i udtryk"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "{ forventet efter ? i udtryk"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "} forventet i udtryk"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ": forventet efter ?-underudtryk"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "{ forventet efter : i udtryk"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "| forventet ved slutningen af udtryk"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3431,328 +3782,328 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: ukendt mćrkenavn: \"%s\" ignoreret\n"
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan ikke ĺbne '%s'-indeks ved brug af db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan ikke ĺbne '%s'-indeks\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr "der er ikke sat nogen dbpath\n"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan ikke lćse hoved ved 0x%x\n"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "fjerner \"%s\" fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "fjerne %d indgange fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 "tilfřjer \"%s\" til '%s'-indekset.\n"
 "\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "tilfřjer %d indgange til '%s'-indekset.\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "der ikke sat nogen dbpath"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "genopbygger database %s over i %s\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "den midlertidige database %s eksisterer allerede\n"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 "opretter kataloget %s\n"
 "\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "opretter kataloget %s: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ĺbner gammel database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ĺbner ny database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "post nummer %d i databasen er fejlbehćftet -- overspringer.\n"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kunne ikke tilfřje posten, der tidligere var ved %d\n"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "kunne ikke erstatte gammel database med ny database!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "erstat filer i %s med filer fra %s for at genoprette"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr "fjerner kataloget %s\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiv %d tom %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tom)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makroen %%%s har et uafsluttet indhold (body)\n"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makroen %%%s har et ugyldig navn (%%define)\n"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makroen %%%s har uafsluttede parametre\n"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makroen %%%s har intet indhold\n"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makroen %%%s kunne ikke udfoldes\n"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makroen %%%s har ugyldigt navn (%%undefine)\n"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) blev ikke brugt under niveau %d\n"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Ukendt tilvalg %c i %s(%s)\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Rekursionsdybde(%d) overskrider maks(%d)\n"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Uafsluttet %c: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Et %% efterfřlges af en makro, der ikke kan tolkes\n"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Makroen %%%.*s blev ikke fundet, overspringer\n"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "Overlřb i mĺlbuffer\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Filen %s er mindre end %u byte\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "Succes"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Ugyldigt svar fra server"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr "I/O-fejl for server"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "Tidsudlřb for server"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "Kunne ikke skaffe serverens IP-addresse"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "Kunne ikke slĺ serverens navn op"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "Kunne ikke etablere en forbindelse til serveren"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "Kunne ikke etablere en data-forbindelse til serveren"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr "I/O-fejl i lokal fil"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Kunne ikke sćtte fjernserveren i passiv tilstand"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Fil ikke fundet pĺ server"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "Afbryder programmet"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "Ukendt eller uventet fejl"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "logger pĺ %s som %s, adgangskode %s\n"
@@ -3762,6 +4113,7 @@ msgid "(no error)"
 msgstr "(ingen fejl)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "fatal fejl: "
@@ -3781,96 +4133,61 @@ msgstr "advarsel: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "hukommelsesallokering (%u byte) returnerede NULL.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "advarsel: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "advarsel: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, fuzzy, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "advarsel: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Adgangskode for %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "Fejl: %sport skal vćre et tal\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "url-port skal vćre et tal\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "verificér pakkesignatur"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-#, fuzzy
-msgid "don't change directories"
-msgstr ""
-"opretter kataloget %s\n"
-"\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+#: tools/rpmcache.c:519
 #, fuzzy
-msgid "Common options for all rpm modes and executables:"
-msgstr "Fćlles tilvalg for alle rpm-tilstande:"
+msgid "File tree walk options:"
+msgstr "Signaturtilvalg"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ĺbning mislykkedes: %s\n"
@@ -3967,6 +4284,27 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "Fćlles tilvalg for alle rpm-tilstande:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles kan kun angives ved installation"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "linie %d: Filnavn ikke tilladt: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "intallér selvom pakken erstatter installerede filer"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "forespřrgsel af %s mislykkedes\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "pakke med gammelt kildeformat kan ikke forespřrges\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "ingen pakker\n"
+
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "ekskluderer multilib-sti %s%s\n"
 
@@ -4008,10 +4346,6 @@ msgstr ""
 #~ msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n"
 
 #, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "křrer postinstallations-skript (hvis det findes)\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr ""
@@ -5034,18 +5368,12 @@ msgstr ""
 #~ msgid "stopping install as we're running --test\n"
 #~ msgstr "stopper installation, da vi křrer --test\n"
 
-#~ msgid "running preinstall script (if any)\n"
-#~ msgstr "křrer prćinstallations-skript (hvis det findes)\n"
-
 #~ msgid "removal of %s failed: %s\n"
 #~ msgstr "fjernelse af %s mislykkedes: %s\n"
 
 #~ msgid "will remove files test = %d\n"
 #~ msgstr "vil fjerne filer test = %d\n"
 
-#~ msgid "running postuninstall script (if any)\n"
-#~ msgstr "křrer skriptet postuninstall (hvis det findes)\n"
-
 #~ msgid ""
 #~ "retrieval of return code of %s scriptlet from %s-%s-%s failed, waitpid "
 #~ "returned %s\n"
diff --git a/po/de.po b/po/de.po
index 8382b6d38..a116648b6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,14 +37,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -104,11 +104,12 @@ msgid "Building for target %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr ""
 
 #: rpm2cpio.c:60
-#, fuzzy
+#, fuzzy, c-format
 msgid "error reading header from package\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
@@ -125,163 +126,167 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 # , c-format
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Version %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright Š 1998 - Red Hat Software"
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Dies darf unter den Bedingungen der ťGNU GPLŤ frei verteilt werden"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "Es darf nur ein Hauptmodus angegeben werden"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 "Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
 "werden"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "Dateien können nur während der Paketinstallation verschoben werden"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "Argumente zu --prefix müssen mit einem / beginnen"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -290,7 +295,7 @@ msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -299,7 +304,7 @@ msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -308,7 +313,7 @@ msgstr ""
 "--nodeps darf nur während der Paketinstallation, -deinstallation und -"
 "überprüfung angegeben werden"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -316,7 +321,7 @@ msgstr ""
 "--test darf nur während der Paketinstallation, -deinstallation und -"
 "erstellung angegeben werden"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -324,86 +329,89 @@ msgstr ""
 "--root (-r) darf nur während der Paketinstallation, -deinstallation, -"
 "anfrage und Datenbankneuerstellungen angegeben werden"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpmqv.c:565
-#, fuzzy
+#: rpmqv.c:568
+#, fuzzy, c-format
 msgid "pgp not found: "
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Das Passwort ist richtig.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign darf nur während der Paketerstellung benutzt werden"
 
-#: rpmqv.c:605
-#, fuzzy
+#: rpmqv.c:608
+#, fuzzy, c-format
 msgid "exec failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
 # , c-format
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
@@ -487,177 +495,177 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr "? im Ausdruck erwartet"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "fehlende { nach %{"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "fehlender ':' bei %s:%d"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "fehlende { nach %{"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:599
+#: build/files.c:608
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build/files.c:609
+#: build/files.c:618
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build/files.c:621
+#: build/files.c:630
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 # , c-format
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:981
+#: build/files.c:990
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1152
+#: build/files.c:1161
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1538
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
 # , c-format
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/files.c:2350
+#: build/files.c:2362
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -665,7 +673,7 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: build/files.c:2457
+#: build/files.c:2469
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -721,7 +729,7 @@ msgstr "lesen fehlgeschlagen: %s (%d)"
 msgid "cpio_copy read failed: %s\n"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
@@ -731,139 +739,139 @@ msgstr "Fehler: kann Datei %s nicht öffnen\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
 # , c-format
-#: build/pack.c:295
+#: build/pack.c:309
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/pack.c:305
+#: build/pack.c:319
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
 # , c-format
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "PGP-Signatur generieren"
 
 # , c-format
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:596
+#: build/pack.c:610
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:647
+#: build/pack.c:661
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:658
+#: build/pack.c:672
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:672
+#: build/pack.c:686
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:682
+#: build/pack.c:696
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:688
+#: build/pack.c:702
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
@@ -910,17 +918,17 @@ msgid "line %d: Error parsing %%description: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # , c-format
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -941,129 +949,134 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
 msgid "line %d: Second %%files list\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
 # , c-format
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "Hole %s heraus\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "\"%s\" bezeichnet mehrere Pakete\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
 # , c-format
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "(unbekannter Typ)"
 
 # , c-format
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
 # , c-format
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "fehlende Architektur für %s bei %s:%d"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Fataler Fehler: "
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "      Optionen der Paketauswahl:"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1151,88 +1164,93 @@ msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: build/parseReqs.c:113
-#, fuzzy, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "Paket %s wird nicht in %s aufgeführt"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # , c-format
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, fuzzy, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, fuzzy, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
 # , c-format
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, fuzzy, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
+
+#: build/parseScript.c:209
 #, fuzzy, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
 # , c-format
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, fuzzy, c-format
 msgid "line %d: Second %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "Paket %s wird nicht in %s aufgeführt"
+
 # , c-format
-#: build/parseSpec.c:158
+#: build/parseSpec.c:201
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -1374,20 +1392,20 @@ msgstr "Dateiabhängigkeiten nicht überprüfen"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "Dateiabhängigkeiten nicht überprüfen"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "Paketsignatur überprüfen"
@@ -1493,83 +1511,94 @@ msgstr ""
 msgid " failed - "
 msgstr "pgp fehlgeschlagen"
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "Paket %s ist nicht installiert\n"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "die Datei ť%sŤ gehört zu keinem Paket\n"
 
 # , c-format
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
 # FIXME
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(keine Zahl)"
 
@@ -1582,7 +1611,7 @@ msgstr "(keine Zahl)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(keine Zahl)"
@@ -1591,7 +1620,7 @@ msgstr "(keine Zahl)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "alle PGP-Signaturen überspringen"
@@ -1614,7 +1643,7 @@ msgid "failed to stat %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -1690,275 +1719,318 @@ msgstr "öffnen von %s fehlgeschlagen: %s\n"
 msgid "%s created as %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/misc.c:42
+# FIXME
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "Fehler beim Löschen des Eintrags %s nach %s"
+
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, fuzzy, c-format
 msgid "error creating temporary file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:786
+#: lib/package.c:794
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: ťrpmReadSignatureŤ fehlgeschlagen\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "Die benutzte RPM-Version anzeigen"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "<VERZ> als Stammverzeichnis benutzen"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "Die benutzte RPM-Version anzeigen"
 
 # , c-format
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr ""
 
 # , c-format
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "Verschiebungen müssen mit einem ť/Ť beginnen"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "Verschiebungen müssen ein ť=Ť beinhalten"
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "bei Verschiebungen muss ein ť/Ť dem ť=Ť folgen"
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "Paket hat keinen Namen"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "alle Dateien installieren, auch die config-Dateien, die sonst übergangen "
 "würden"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1966,162 +2038,171 @@ msgstr ""
 "Alle Pakete entfernen, die mit <PAKET> übereinstimmen (normalerweise wird "
 "ein Fehler angezeigt, wenn <PAKET> mehrere Pakete bezeichnet)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "Keine paketspezifischen Skripte ausführen"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "Paket löschen (deinstallieren)"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 #, fuzzy
 msgid "<package>+"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "Dokumentation nicht installieren"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "Paket %s ist nicht installiert\n"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "Abkürzung für --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Fortschrittsanzeige bei der Paketinstallation (gut zusammen mit -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "Paket-Betriebssystem nicht überprüfen"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "Dokumentation installieren"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "Paket installieren"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "Datenbank erneuern, aber das Dateisystem nicht verändern"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "Dateiabhängigkeiten nicht überprüfen"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "Paket installieren"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "Keine paketspezifischen Skripte ausführen"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2129,513 +2210,529 @@ msgstr ""
 "Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
 "Aktualisierungen automatisch)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "Prozentangabe bei der Paketinstallation ausgeben"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "Anfrage-Modus"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 #, fuzzy
 msgid "query/verify package(s) owning file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
+msgid "query/verify package(s) in group"
+msgstr "Paket hat keinen Namen"
 
-#: lib/poptQV.c:103
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) in group"
+msgid "query/verify a package file"
+msgstr "Anfrage an alle Pakete"
+
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "Paket hat keinen Namen"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "Paket hat keinen Namen"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "Anfrage an alle Pakete"
+msgid "query/verify package(s) with header identifier"
+msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 #, fuzzy
 msgid "rpm query mode"
 msgstr "Anfrage-Modus"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 #, fuzzy
 msgid "query a spec file"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "Paket hat keinen Namen"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 #, fuzzy
 msgid "query the package(s) triggered by the package"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "Anfrage-Modus"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 #, fuzzy
 msgid "query/verify the package(s) which require a dependency"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 #, fuzzy
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "Es wurden keine Argumente für die Anfrage angegeben"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
+
+#: lib/poptQV.c:257
 #, fuzzy
 msgid "list all configuration files"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 #, fuzzy
 msgid "list all documentation files"
 msgstr "Dokumentation installieren"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 #, fuzzy
 msgid "dump basic file information"
 msgstr "Paketinformationen anzeigen"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 #, fuzzy
 msgid "list files in package"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "use the following query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "Dateiabhängigkeiten nicht überprüfen"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "Paketsignatur überprüfen"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 #, fuzzy
 msgid "generate signature"
 msgstr "PGP-Signatur generieren"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "Keine Stufen ausführen"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "Fehler beim Format %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(beinhaltet keine Dateien)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:236
+#: lib/query.c:241
 #, fuzzy
 msgid "not installed "
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(unbekannter Typ)"
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "Paket hat keinen Namen"
 
-#: lib/query.c:299
+#: lib/query.c:304
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "Paket hat keinen Namen"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, fuzzy, c-format
-msgid "open of %s failed: %s\n"
-msgstr "öffnen von %s fehlgeschlagen: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "Anfrage von %s fehlgeschlagen\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "kein Paket triggert %s\n"
-
-#: lib/query.c:517
-#, fuzzy
-msgid "no packages\n"
-msgstr "Anfrage an alle Pakete"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "unbekannter ťTagŤ"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "kein Paket triggert %s\n"
 
 # , c-format
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "kein Paket triggert %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "kein Paket verlangt %s\n"
 
 # oder besser: ... listet %s auf? -ke-
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "kein Paket stellt %s bereit\n"
 
 # , c-format
-#: lib/query.c:719
+#: lib/query.c:622
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, 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:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
 
 # , c-format
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2734,28 +2831,28 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -2765,162 +2862,192 @@ msgstr "Paket %s wird nicht in %s aufgeführt"
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, fuzzy, c-format
+msgid "open of %s failed: %s\n"
+msgstr "öffnen von %s fehlgeschlagen: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "unbekannter ťTagŤ"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "Paket installieren"
 
 # , c-format
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Hole %s heraus\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "Fehler: %s kann nicht installiert werden\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "Paket installieren"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "kein Paket triggert %s\n"
+
+#: lib/rpminstall.c:638
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "Paket installieren"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" bezeichnet mehrere Pakete\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+# , c-format
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "Hole %s heraus\n"
+
 #: lib/rpmlead.c:56
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
@@ -2935,7 +3062,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2962,6 +3089,10 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+msgid "internal support for lua scripts."
+msgstr ""
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -3041,179 +3172,234 @@ msgstr " steht im Konflikt mit %s-%s-%s\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "fehlendes zweites ':' bei %s:%d"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "fehlender Name cer Architektur bei %s:%d"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Unvollständige Datenzeile bei %s:%d"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Zu viele Argumente in der Datenzeile bei %s:%d"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Unzureichende arch/os Zahl: %s (%s:%d)"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Unvollständige Standardzeile bei %s:%d"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Zu viele Argumente in der Standardzeile bei %s:%d"
 
 # , c-format
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "fehlender ':' bei %s:%d"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "fehlendes Argument für %s bei %s:%d"
 
 # , c-format
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "fehlende Architektur für %s bei %s:%d"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "unzureichende Option '%s' bei %s:%d"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "fehlende { nach %{"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
 # , c-format
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3230,6 +3416,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3254,6 +3441,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3326,6 +3514,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3349,44 +3540,167 @@ msgstr ""
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "Paket installieren"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "alle MD5-Signaturen überspringen"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "Paket hat keinen Namen"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "kein Paket triggert %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "Anfrage an alle Pakete"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "Anfrage an alle Pakete"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "Fehler beim Suchen nach Paket %s\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3395,11 +3709,15 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3408,7 +3726,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3416,13 +3734,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "fehlende { nach %{"
 
 #: lib/verify.c:437
@@ -3455,138 +3797,138 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "geteilt"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "fehlende { nach %{"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "fehlende } nach %{"
 
 # ťTagŤ übersetzen??? -ke-
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "leeres ťTagŤ-Format"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "leerer ťTagŤ-Name"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "unbekannter ťTagŤ"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "] am Ende des Arrays erwartet"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "unerwartete ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "unerwartete }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "? im Ausdruck erwartet"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ nach ? im Ausdruck erwartet"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "} im Ausdruck erwartet"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ": nach ? Unterausdruck erwartet"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ nach : im Ausdruck erwartet"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "| am Ende des Ausdrucks erwartet"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3613,341 +3955,341 @@ msgstr "Anfrage von %s fehlgeschlagen\n"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "ťdbpathŤ ist nicht gesetzt"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # FIXME
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "ťdbpathŤ ist nicht gesetzt"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
 # , c-format
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "(unbekannter Typ)"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 #, fuzzy
 msgid "Bad server response"
 msgstr "Nicht passende Antwort des FTP-Servers"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 #, fuzzy
 msgid "Server I/O error"
 msgstr "FTP IO-Fehler"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 #, fuzzy
 msgid "Server timeout"
 msgstr "Timeout des FTP-Servers"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Verbindung zum FTP-Server fehlgeschlagen"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "IO-Fehler bei lokaler Datei"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP Unbekannter oder nicht erwarteter Fehler"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3958,6 +4300,7 @@ msgid "(no error)"
 msgstr "Fehler: "
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "Fataler Fehler: "
@@ -3977,95 +4320,62 @@ msgstr "Warnung: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Passworf für %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "Paketsignatur überprüfen"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-#, fuzzy
-msgid "don't change directories"
-msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
@@ -4162,6 +4472,27 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr ""
+#~ "--replacefiles darf nur während der Paketinstallation angegeben werden"
+
+#, fuzzy
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "Paket %s wird nicht in %s aufgeführt"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "Anfrage von %s fehlgeschlagen\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
+
+#, fuzzy
+#~ msgid "no packages\n"
+#~ msgstr "Anfrage an alle Pakete"
+
 # , c-format
 #, fuzzy
 #~ msgid "excluding multilib path %s%s\n"
@@ -4211,10 +4542,6 @@ msgstr ""
 #~ msgstr "Alte Signatur (nur intern)!  Wie bist du daran gekommen!?"
 
 #, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "Keine Stufen ausführen"
-
-#, fuzzy
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr "Ausführung des Skripts fehlgeschlagen"
@@ -5497,10 +5824,6 @@ msgstr ""
 #~ msgid "package %s not listed in %s"
 #~ msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#, fuzzy
-#~ msgid "package has no group\n"
-#~ msgstr "Paket hat keinen Namen"
-
 # FIXME
 #, fuzzy
 #~ msgid "removing requiredby index for %s\n"
diff --git a/po/fi.po b/po/fi.po
index 14a18be35..712ac8509 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -63,11 +63,12 @@ msgid "Building for target %s\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr ""
 
 #: rpm2cpio.c:60
-#, fuzzy
+#, fuzzy, c-format
 msgid "error reading header from package\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
@@ -84,156 +85,161 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versio %s\n"
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "vain yksi päämoodi voidaan määritellä"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 #, fuzzy
 msgid "unexpected query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "vain asennus tai päivitys voidaan pakottaa"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix parametrien pitää alkaa /-merkillä"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -241,7 +247,7 @@ msgid ""
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -249,7 +255,7 @@ msgid ""
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -258,7 +264,7 @@ msgstr ""
 "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -266,7 +272,7 @@ msgstr ""
 "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
 "käännettäessä"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -274,85 +280,88 @@ msgstr ""
 "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
 "kyseltäessä ja tietokannan uudelleenluonnissa"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametrit --root (-r):lle alettava /-merkillä"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmqv.c:565
-#, fuzzy
+#: rpmqv.c:568
+#, fuzzy, c-format
 msgid "pgp not found: "
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
 
-#: rpmqv.c:605
-#, fuzzy
+#: rpmqv.c:608
+#, fuzzy, c-format
 msgid "exec failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "uudelleenkäännolle ei määritelty paketteja"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "käännökselle ei annettu määrittelytiedostoja"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "käännökselle ei määritelty tar-tiedostoja"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrejä"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "En voi avata %s luettavaksi: %s."
@@ -434,176 +443,176 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "puuttuva ':', %s:%d"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:608
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:609
+#: build/files.c:618
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:621
+#: build/files.c:630
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:981
+#: build/files.c:990
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "en voinut avata %s: %s"
@@ -657,7 +666,7 @@ msgstr "luku epäonnistui: %s (%d)"
 msgid "cpio_copy read failed: %s\n"
 msgstr "luku epäonnistui: %s (%d)"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
@@ -667,126 +676,126 @@ msgstr "virhe: tiedostoa %s ei voi avata\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "virhe: %s ei vaikuta RPM paketilta\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -831,17 +840,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
@@ -861,123 +870,128 @@ msgstr "en voinut avata %s: %s"
 msgid "line %d: Second %%files list\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "Haen: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "\"%s\" määrittää useita paketteja\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "(tuntematon tyyppi)"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "%s:n puuttuva arkkitehtuuri %s:%d"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "vakava virhe: "
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "      Paketin määrittelyparametrit:"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1056,83 +1070,88 @@ msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/parseReqs.c:113
-#, fuzzy, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "paketti %s ei ole %s:ssä"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, fuzzy, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, fuzzy, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, fuzzy, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "siirtojen pitää alkaa /-merkillä"
+
+#: build/parseScript.c:209
 #, fuzzy, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, fuzzy, c-format
 msgid "line %d: Second %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "paketti %s ei ole %s:ssä"
+
+#: build/parseSpec.c:201
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "en voinut avata %s: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
@@ -1271,20 +1290,20 @@ msgstr "älä tarkista paketin riippuvuuksia"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "tarkista paketin allekirjoitus"
@@ -1390,81 +1409,92 @@ msgstr ""
 msgid " failed - "
 msgstr "pgp epäonnistui"
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "paketti %s ei ole asennettu\n"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "en voinut avata %s: %s"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "kysele kaikki paketit"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(ei ole luku)"
 
@@ -1477,7 +1507,7 @@ msgstr "(ei ole luku)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(ei ole luku)"
@@ -1486,7 +1516,7 @@ msgstr "(ei ole luku)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "ohita PGP-allekirjoitukset"
@@ -1506,7 +1536,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -1580,270 +1610,312 @@ msgstr "%s:n avaus ei onnistunut: %s\n"
 msgid "%s created as %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "virhe poistettaessa tietuetta %s %s:stä"
+
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, fuzzy, c-format
 msgid "error creating temporary file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:786
+#: lib/package.c:794
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "virhe luotaessa hakemistoa %s: %s"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "lähetä vakiotuloste <komento>:lle"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "käytä <hakem> ylimpänä hakemistona"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "en voinut avata %s: %s"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "en voinut avata %s: %s"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "en voinut avata %s: %s"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "en voinut avata %s: %s"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "siirroissa pitää olla =-merkki"
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "siirroissa pitää olla / =-merkin jälkeen"
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "paketilla ei ole nimeä"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1851,161 +1923,170 @@ msgstr ""
 "poista kaikki paketit, joiden nimeä vastaa  <paketti> (tavallisesti, jos  "
 "<paketti> määrittää useita paketteja, tulee virhe)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "älä aja mitään pakettikohtaisia skriptejä"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "poista paketti"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 #, fuzzy
 msgid "<package>+"
 msgstr "kysele kaikki paketit"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "älä asenna dokumentointia"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "paketti %s ei ole asennettu\n"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "lyhenne parametreille --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -b<vaihe> <määrittely> "
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "älä tarkista paketin käyttöjärjestelmää"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "asenna dokumentaatio"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "asenna paketti"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "asenna paketti"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "älä aja mitään pakettikohtaisia skriptejä"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "älä suorita asennusskriptejä"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "älä suorita asennusskriptejä"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "älä suorita asennusskriptejä"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2013,505 +2094,521 @@ msgstr ""
 "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
 "automaattisesti)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "tulosta asennuksen eteneminen prosentteina"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "asenna uudelleen, jos paketti on jo asennettu"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "älä asenna, mutta kerro onnistuisiko se"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "kysele kaikki paketit"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "kyselymoodi"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 #, fuzzy
 msgid "query/verify package(s) owning file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
+msgid "query/verify package(s) in group"
+msgstr "paketilla ei ole nimeä"
 
-#: lib/poptQV.c:103
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) in group"
+msgid "query/verify a package file"
+msgstr "kysele kaikki paketit"
+
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "paketilla ei ole nimeä"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "paketilla ei ole nimeä"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "kysele kaikki paketit"
+msgid "query/verify package(s) with header identifier"
+msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 #, fuzzy
 msgid "rpm query mode"
 msgstr "kyselymoodi"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 #, fuzzy
 msgid "query a spec file"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "paketilla ei ole nimeä"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 #, fuzzy
 msgid "query the package(s) triggered by the package"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "kyselymoodi"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 #, fuzzy
 msgid "query/verify the package(s) which require a dependency"
 msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 #, fuzzy
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "kyselylle ei annettu parametrejä"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "en voi lukea headeria %d:stä päivittäessä"
+
+#: lib/poptQV.c:257
 #, fuzzy
 msgid "list all configuration files"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 #, fuzzy
 msgid "list all documentation files"
 msgstr "asenna dokumentaatio"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 #, fuzzy
 msgid "dump basic file information"
 msgstr "näytä paketin tiedot"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 #, fuzzy
 msgid "list files in package"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "use the following query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "tarkista paketin allekirjoitus"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 #, fuzzy
 msgid "generate signature"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "älä suorita mitään vaiheita"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, 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:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp epäonnistui"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "virhe formaatissa: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(ei tiedostoja)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:236
+#: lib/query.c:241
 #, fuzzy
 msgid "not installed "
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(tuntematon tyyppi)"
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "paketilla ei ole nimeä"
 
-#: lib/query.c:299
+#: lib/query.c:304
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paketilla ei ole nimeä"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, fuzzy, c-format
-msgid "open of %s failed: %s\n"
-msgstr "%s:n avaus ei onnistunut: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "%s:n kysely ei onnistunut\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "mikään paketti ei laukaise %s:a\n"
-
-#: lib/query.c:517
-#, fuzzy
-msgid "no packages\n"
-msgstr "kysele kaikki paketit"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "tuntematon nimiö"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "mikään paketti ei laukaise %s:a\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "mikään paketti ei laukaise %s:a\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "mikään pakettie ei tarvitse %s:a\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "mikään paketti ei tarjoa %s:a\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2610,28 +2707,28 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
@@ -2641,158 +2738,187 @@ msgstr "paketti %s ei ole %s:ssä"
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, fuzzy, c-format
+msgid "open of %s failed: %s\n"
+msgstr "%s:n avaus ei onnistunut: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "tuntematon nimiö"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "puuttuvat riippuvuudet:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "asennukselle ei määritelty paketteja"
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "asenna paketti"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Haen: %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "virhe: %s ei voida asentaa\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "asenna paketti"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "mikään paketti ei laukaise %s:a\n"
+
+#: lib/rpminstall.c:638
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "puuttuvat riippuvuudet:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "asenna paketti"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" määrittää useita paketteja\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "Haen: %s\n"
+
 #: lib/rpmlead.c:56
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
@@ -2807,7 +2933,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2834,6 +2960,10 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+msgid "internal support for lua scripts."
+msgstr ""
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2909,174 +3039,229 @@ msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "toinen ':' puuttuu, %s:%d"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "puuttuva arkkitehtuurin nimi, %s:%d"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Epätäydellinen datarivi, %s:%d"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "liian monta parametriä datarivillä %s:%d"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Huono arkkitehtuuri/käyttöjärjestelmä numero: %s (%s:%d)"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Epätäydellinen oletusrivi, %s:%d"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "liian monta parametriä oletusrivillä %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "En voi lukea %s: %s."
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "puuttuva ':', %s:%d"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s:n puuttuva parametri %s:%d"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%s:n puuttuva arkkitehtuuri %s:%d"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "huono parametri '%s', %s:%d"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "En voi avata %s luettavaksi: %s."
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "virhe luotaessa hakemistoa %s: %s"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3093,6 +3278,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3117,6 +3303,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3189,6 +3376,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3212,44 +3402,167 @@ msgstr ""
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "asenna paketti"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ohita MD5-allekirjoitukset"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "paketilla ei ole nimeä"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "mikään paketti ei laukaise %s:a\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "kysele kaikki paketit"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "kysele kaikki paketit"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "virhe etsittäessä pakettia %s\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3258,11 +3571,15 @@ msgstr "virhe luotaessa hakemistoa %s: %s"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3271,7 +3588,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3279,13 +3596,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "puuttuva '{' '%':n jälkeen"
 
 #: lib/verify.c:437
@@ -3318,137 +3659,137 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "jaettua"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "puuttuva '{' '%{':n jälkeen"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "tyhjä nimiön formaatti"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "tyhjä nimiön nimi"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "tuntematon nimiö"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "']' puuttuu taulukkomäärittelyn lopusta"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "odottamaton ']'"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "odottamaton '}'"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "odotin '}'-merkkiä ilmauksessa"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3475,334 +3816,334 @@ msgstr "%s:n kysely ei onnistunut\n"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "(tuntematon tyyppi)"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 #, fuzzy
 msgid "Bad server response"
 msgstr "Virheellinen FTP-palvelijan vastaus"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 #, fuzzy
 msgid "Server I/O error"
 msgstr "FTP:n IO-virhe"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP-palvelimen timeout"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP-palvelimen osoitetta ei löytynyt"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP-palvelimen nimeä ei löytynyt"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "En saanut yhteyttä FTP-palvelijaan"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "En saanut data-yhteyttä FTP-palvelijaan"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "Paikallisen tiedoston IO-virhe"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Virhe asetettaessa palvelinta passiiviin moodiin"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP:n tuntematon tai odottamaton virhe"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3813,6 +4154,7 @@ msgid "(no error)"
 msgstr "virhe: "
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "vakava virhe: "
@@ -3832,94 +4174,61 @@ msgstr "varoitus: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s:n salasana: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "virhe: ftpport pitää olla luku\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "virhe: ftpport pitää olla luku\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "tarkista paketin allekirjoitus"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-#, fuzzy
-msgid "don't change directories"
-msgstr "virhe luotaessa hakemistoa %s: %s"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr ""
-
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: avaus ei onnistunut\n"
@@ -4016,6 +4325,26 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
+
+#, fuzzy
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "paketti %s ei ole %s:ssä"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "%s:n kysely ei onnistunut\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
+
+#, fuzzy
+#~ msgid "no packages\n"
+#~ msgstr "kysele kaikki paketit"
+
 #, fuzzy
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "Haen: %s\n"
@@ -4060,10 +4389,6 @@ msgstr ""
 #~ msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?"
 
 #, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "älä suorita mitään vaiheita"
-
-#, fuzzy
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr "skriptin ajo epäonnistui"
@@ -5343,10 +5668,6 @@ msgstr ""
 #~ msgstr "paketti %s ei ole %s:ssä"
 
 #, fuzzy
-#~ msgid "package has no group\n"
-#~ msgstr "paketilla ei ole nimeä"
-
-#, fuzzy
 #~ msgid "removing requiredby index for %s\n"
 #~ msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
diff --git a/po/fr.po b/po/fr.po
index aff83bb33..b5a736da4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,14 +10,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: RPM 4.2.1\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 2003-07-06 01:36+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 msgid "Failed build dependencies:\n"
@@ -71,10 +71,12 @@ msgid "Building for target %s\n"
 msgstr "Construction pour cible %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "l'argument n'est pas un paquetage RPM\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "erreur dans la lecteur de l'entĂŞte du paquetage\n"
 
@@ -91,160 +93,167 @@ msgstr "Options de requĂŞtes (avec -q ou --query):"
 msgid "Verify options (with -V or --verify):"
 msgstr "Options de vĂŠrifications (avec -V ou --verify):"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "Options de vĂŠrifications (avec -V ou --verify):"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "Otions de signatures"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "Options de la base de donnĂŠes"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Options de construction avec [ <fichier_spec> | <tarball> | <paquetage "
 "source> ]:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr "Options d'installation/dĂŠsinstallation/mise Ă  jour:"
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
-msgstr "Options communes Ă  tous les modes de rpm:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
+msgstr "Options communes a tous les modes et executables rpm:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 
-#: rpmqv.c:137
+#: rpmqv.c:145
+#, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Ce programme peut ĂŞtre librement redistribuĂŠ sous les termes de la licence "
 "GNU GPL\n"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Erreur interne au traitement de l'argument (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "un seul mode majeur peut ĂŞtre specifiĂŠ"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "un seul type de requĂŞte/vĂŠrification Ă  la fois"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "option de requĂŞte inattendue"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "format de requĂŞte inattendu"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "source de requĂŞte inattendue"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "seuls l'installation, la mise Ă  jour, rmsource et rmspec peuvent ĂŞtre forcĂŠs"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "les fichiers ne peuvent ĂŞtre relogĂŠs qu'Ă  l'installation"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "impossible d'utiliser --prefix avec --relocate ou --excludepath"
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate et --excludepath ne peuvent ĂŞtre utilisĂŠs qu'Ă  l'installation de "
 "nouveaux paquetages"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 "--prefix ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de nouveaux paquetages"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "les arguments de --prefix doivent commencer par un /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "utiliser --excludedocs _OU_ --includedocs (pas les 2)"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches ne peut ĂŞtre utilisĂŠ qu'Ă  la dĂŠsinstallation de paquetages"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation/la dĂŠsinstallation de "
 "paquetages"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -252,7 +261,7 @@ msgstr ""
 "les options dĂŠsactivant les scripts ne peuvent ĂŞtre utilisĂŠes qu'Ă  la (dĂŠs)"
 "installation"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -260,7 +269,7 @@ msgstr ""
 "les options desactivant les triggers ne peuvent ĂŞtre utilisĂŠes qu'Ă  la (dĂŠs)"
 "installation"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -268,14 +277,14 @@ msgstr ""
 "--nodeps ne peut ĂŞtre spĂŠcifiĂŠ que pour la (re)construction, la "
 "recompilation, l'(dĂŠs)installation, et la vĂŠrification"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test ne peut ĂŞtre spĂŠcifiĂŠ que pour la (dĂŠs)installation et la construction"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -283,81 +292,86 @@ msgstr ""
 "--root (-r) ne peut ĂŞtre utilisĂŠ que pour la (dĂŠs)installation, les requĂŞtes "
 "et la reconstruction de la base de donnĂŠes"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "les arguments ed --root (-r) doivent commencer par un /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "aucun fichier Ă  signer\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "ne peut accĂŠder au fichier %s\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp non trouvĂŠ: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Entrez la phrase de passe: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Mauvaise phrase de passe\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Phrase de passe bonne.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "%%_signature invalide and le fichier de macros.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign est rĂŠservĂŠ Ă  la construction d'un paquetage"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "echec de l'exec\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "aucun paquetage spĂŠcifiĂŠ pour reconstruction"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "aucun fichier spec spĂŠcifiĂŠ pour construction"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "aucun fichier tar spĂŠcifiĂŠ pour construction"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr "n'a aucun paquetage Ă  dĂŠsinstaller"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "n'a aucun paquetage Ă  installer"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "aucun argument fourni Ă  la requĂŞte"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "aucun argument fourni Ă  la vĂŠrification"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr "aucun argument fourni"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Incapable d'ouvrir un fichier temporaire.\n"
 
@@ -436,169 +450,169 @@ msgstr "&& et || ne sont pas supportÊs sur des chaÎnes de caractères\n"
 msgid "syntax error in expression\n"
 msgstr "erreur de syntaxe dans l'expression\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "ĂŠchec du TIMECHECK: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "'(' manquante dans %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "')' manquante dans %s(%s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Lexème %s invalide: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s manquant(e) dans %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "espace non-blanc suivant %s(): %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Mauvaise syntaxe: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Mauvais mode spec: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Mauvais dirmode spec: %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Mauvaise longueur de la locale: \"%.*s\" dans %%lang(%s)\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Deux fois la mĂŞme locale %.*s dans %%lang(%s)\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Limite atteinte pour %%docdir\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Un seul argument pour %%docdir\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Deux fichiers sur une seule ligne: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Le fichier doit commencer par \"/\": %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Ne peut mĂŠlanger un %%doc spĂŠcial avec d'autre formes: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fichier listĂŠ deux fois: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Lien symbolique pointant sur BuildRoot: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Le fichier ne correpond pas Ă  prefix (%s): %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fichier non trouvĂŠ: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: ĂŠchec de la lecture de la clĂŠ publique.\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s n'est pas une clĂŠ publique blindĂŠe.\n"
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: ĂŠchec de la lecture de la clĂŠ publique.\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Le fichier non prĂŠcĂŠdĂŠ d'un \"/\": %s\n"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Substitution non permise: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Fichier non trouvĂŠ par la substitution: %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Ne peut ouvrir le fichier donnĂŠ Ă  %%files %s: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "Ligne: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Mauvais fichier: %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Mauvais possesseur/groupe: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "VĂŠrification des fichiers non empaquetĂŠs: %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -607,7 +621,7 @@ msgstr ""
 "Fichier(s) installĂŠ(s) (mais non empaquetĂŠs):\n"
 "%s"
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Traitement des fichiers: %s-%s-%s\n"
@@ -661,7 +675,7 @@ msgstr "Echec d'ĂŠcriture cpio_copy: %s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "Echec de lecture cpio_copy: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Impossible d'ouvrir le fichier PreIn: %s\n"
@@ -671,122 +685,122 @@ msgstr "Impossible d'ouvrir le fichier PreIn: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Impossible d'ouvrir le fichier PreUn: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Impossible d'ouvrir le fichier PostIn: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Impossible d'ouvrir le fichier PostUn: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Impossible d'ouvrir le fichier VerifyScript: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Impossible d'ouvrir le fichier du script Trigger: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: ouverture de %s: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: lecture de %s: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: ĂŠchec de fseek: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s n'est pas un paquetage RPM\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: lecture de l'entĂŞte de %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 msgid "Unable to create immutable header region.\n"
 msgstr "Impossible de crĂŠer la partie immuable de l'entĂŞte.\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 msgid "Unable to write temp header\n"
 msgstr "Impossible d'ĂŠcrire un entĂŞte temporaire\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "Mauvaises donnĂŠes CSA\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 msgid "Unable to write final header\n"
 msgstr "Impossible d'ĂŠcrire l'entĂŞte dĂŠfinitif\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "GĂŠnĂŠration de la signature: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 msgid "Unable to reload signature header.\n"
 msgstr "Impossible de recharger l'entĂŞte de la signature.\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Impossible d'ouvrir %s: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Impossible d'ĂŠcrire le paquetage: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Impossible d'ouvrir sigtarget %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Impossible de lire l'entĂŞte dans %s: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Impossible d'ĂŠcrire l'entĂŞte dans %s: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Impossible de lire la charge utile dans %s: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Impossible d'ĂŠcrire la charge utile dans %s: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Ecrit: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Ne peut gĂŠnĂŠrer le nom de fichier pour le package %s: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne peut crĂŠer %s: %s\n"
@@ -831,17 +845,17 @@ msgstr "absence de description dans le %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "ligne %d: erreur dans l'analyxe syntaxique de la %%description: %s\n"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "ligne %d: mauvaise option %s: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "ligne %d: trop de noms: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "ligne %d: package inexistant: %s\n"
@@ -861,123 +875,128 @@ msgstr "ligne %d: erreur dans l'analyse syntaxique de %%files: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "ligne %d: deuxième liste %%files\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architecture excluse: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architecture non incluse: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS exclus: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS non inclus: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "Le champ %s doit ĂŞtre prĂŠsent dans le paquetage: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "EntrĂŠe dupliquĂŠe %s dans le paquetage: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Impossible d'ouvrir l'icĂ´ne %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Impossible de lire l'icĂ´ne %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Type d'icĂ´ne inconnu: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "ligne %d: le tag n'accepte qu'un seul lexème: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "ligne %d: tag malformĂŠ: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "ligne %d: tag vide: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "ligne %d: caractère '-' illÊgal dans %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot ne peut pas ĂŞtre \"/\": %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "ligne %d: les prefixes ne doivent pas finir par un \"/\": %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "ligne %d: le docdir doit commencer par un '/': %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "ligne %d: le champ Epoch/Serial doit ĂŞtre un nombre: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "ligne %d: Mauvais %s: qualifiers: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "ligne %d: mauvais format pour BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Erreur interne: tag bidon %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Mauvaise specification de paquetage: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paquetage dĂŠjĂ  existant: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "ligne %d: tag inconnu: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Le fichier spec ne peut pas utiliser BuildRoot\n"
 
@@ -1058,82 +1077,87 @@ msgstr ""
 "ligne %d: le lexème de dÊpendance doit commencer par un alphanumÊrique, '_' "
 "ou '/': %s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "ligne %d: nom de fichier non permis: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "ligne %d: version interdite dans le nom de fichier: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "ligne %d: Version requise: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "ligne %d: les triggers doivent avoir --: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "ligne %d: erreur d'analyse syntaxique %s: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "ligne %d: le nom du script doit commencer par un '/': %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "ligne %d: le nom du script doit commencer par un '/': %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "ligne %d: deuxième %s\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "ligne %d: erreur dans l'analyxe syntaxique de la %%description: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "ligne %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Impossible d'ouvrir %s: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if non terminĂŠ\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean retourne %d\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: j'ai lĂ  un %%else sans %%if\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: j'ai lĂ  un %%endif sans %%if\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include malformĂŠ\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "Pas d'architecture compatible pour construction\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Le paquetage n'a pas de %%description: %s\n"
@@ -1273,18 +1297,18 @@ msgstr "ne pas vĂŠrifier les dĂŠpendances de construction"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "gĂŠnĂŠrer un(des) entĂŞte(s) compatible(s) avec l'emballage rpm[23]"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 msgid "don't verify package digest(s)"
 msgstr "ne pas vĂŠrifier les sommes de hachage du paquetage"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 msgid "don't verify database header(s) when retrieved"
 msgstr "ne pas vĂŠrifier l'entĂŞte de la base de donnĂŠes Ă  la rĂŠcupĂŠration"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 msgid "don't verify package signature(s)"
 msgstr "ne pas vĂŠrifier la(les) signature(s) du paquetage"
 
@@ -1385,53 +1409,64 @@ msgstr "L'entĂŞte ne contient pas le fichier archive"
 msgid " failed - "
 msgstr " ĂŠchec - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "le paquetage %s a dĂŠjĂ  ĂŠtĂŠ rajoutĂŠ, replacĂŠ par %s\n"
+
+#: lib/depends.c:219
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "le paquetage %s a dĂŠjĂ  ĂŠtĂŠ rajoutĂŠ, replacĂŠ par %s\n"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr "(cachĂŠ)"
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr "(fourni par rpmrc)"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr "(fourni par rpmlib)"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr "(fourni par fichiers db)"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr "(fourni par la db)"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 msgid "(db package)"
 msgstr "(fourni par un paquetage)"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 "ignorer la(les) relation(s) entre les noms de paquetages [%d]\t%s -> %s\n"
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "on enlève %s \"%s\" des relations de Ttri.\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "========== enregistrement des relations de Ttri\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
@@ -1439,27 +1474,27 @@ msgstr ""
 "========== Ttri des paquetages (ordre, #prĂŠdĂŠcesseurs, #succeseurs, arbre, "
 "profondeur)\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== successeurs seulement (%d octets)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "BOUCLE:\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== continuation du Ttri ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "ĂŠchec de rpmtsOrder, %d ĂŠlĂŠments toujours prĂŠsents\n"
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(n'est pas un nombre)"
 
@@ -1471,7 +1506,7 @@ msgstr "(pas base64)"
 msgid "(invalid type)"
 msgstr "(type invalide)"
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr "(spa un blob ça)"
 
@@ -1479,7 +1514,7 @@ msgstr "(spa un blob ça)"
 msgid "(invalid xml type)"
 msgstr "(type xml invalide)"
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 msgid "(not an OpenPGP signature)"
 msgstr "(pas une signature OpenPGP)"
 
@@ -1498,7 +1533,7 @@ msgstr "mntctl() n'a pu renvoyer les points de montage: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "ĂŠchec de stat sur %s: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
@@ -1573,262 +1608,311 @@ msgstr "%s n'a pu dĂŠlier %s: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s crĂŠĂŠ en tant que %s\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "rajout de %d entrĂŠes Ă  l'index %s.\n"
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "impossible de crĂŠer %%%s %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'ĂŠcrire dans %%%s %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "erreur en crĂŠant le fichier temporaire %s\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr "hdr SHA1: MAUVAIS, non hexa\n"
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr "hdr SDA: MAUVAIS, non binaire\n"
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr "seules les signatures V3 peut ĂŞtre vĂŠrifiĂŠes, signature V%u ignorĂŠe\n"
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr "hdr taille(%d): PASBON, la lecture renvoie %d\n"
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr "hdr blob(%d): PASBON, la lecture renvoie %d\n"
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "la version 1 de l'emballage n'est pas supportĂŠe par cette version de RPM\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "seuls les emaballages avec un numĂŠro de version majeur <= 4 sont supportĂŠs "
 "par cette version de rpm\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: ĂŠchec de rpmReadSignature: %s"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: aucune signature disponible\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead a ĂŠchouĂŠ: %s"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread a ĂŠchouĂŠ: %s\n"
 
+#: lib/poptALL.c:225
+#, fuzzy
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr "suivre les liens symboliques de la ligne de commande"
+
 #: lib/poptALL.c:227
+#, fuzzy
+msgid "FTS_LOGICAL: logical walk"
+msgstr "marche logique"
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "ne pas modifier les rĂŠpertoires"
+
+#: lib/poptALL.c:231
+#, fuzzy
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr "ne pas prendre les info stat"
+
+#: lib/poptALL.c:233
+#, fuzzy
+msgid "FTS_PHYSICAL: physical walk"
+msgstr "marche physique"
+
+#: lib/poptALL.c:235
+#, fuzzy
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr "renvoyer point et point-point"
+
+#: lib/poptALL.c:237
+#, fuzzy
+msgid "FTS_XDEV: don't cross devices"
+msgstr "ne mĂŠlanger pas les pĂŠriphĂŠriques"
+
+#: lib/poptALL.c:239
+#, fuzzy
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr "ne pas renvoyer d'information"
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr "prĂŠdĂŠfinir la MACRO avec l'EXPRression"
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr "definit MACRO ayant pour valeur EXPR"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 msgid "print macro expansion of EXPR"
 msgstr "affiche la macro-expansion d'EXPR"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "Lire <FICHIER:...> au lieu du(des) fichier(s) par dĂŠfaut"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr "<FICHIER:...>"
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "utilisation de l'API libio(3) dĂŠsactivĂŠe"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 msgid "send stdout to CMD"
 msgstr "envoyer la sortie standard Ă  CMD"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 msgid "use ROOT as top level directory"
 msgstr "utiliser RACINE comme rĂŠpertoire racine"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr "RACINE"
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "afficher les tags de requĂŞte connus"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "afficher la configuration finale des macros et rpmrc"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "afficher moins de dĂŠtails"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "afficher plus de dĂŠtails"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "afficher la version de rpm utilisĂŠ"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr "dĂŠboguer la machine Ă  ĂŠtats du fichier de la charge utile"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "dĂŠboguer la machine Ă  ĂŠtats du fichier de la charge utile"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "dĂŠboguer le flux de donnĂŠes du protocole"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr "dĂŠboguer le traitement des options/arguments"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr "dĂŠboguer la machine Ă  ĂŠtat du paquetage"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "dĂŠboguer la machine Ă  ĂŠtat du paquetage"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "dĂŠboguer les E/S de rpmio"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "dĂŠboguer la manipulation de cache d'URL"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: table d'option mal configurĂŠe (%d)\n"
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "les chemins d'exclusions doivent commencer par un /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "les relogements doivent commencer par un /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "les relogement doivent contenir un ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "dans les relogements un / doit suivre le ="
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr "le roulement arrière prend comme argument une date"
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr "argument date du roulement arrière malformÊ"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 msgid "add suggested packages to transaction"
 msgstr "rajouter Ă  la transaction les paquetages suggĂŠrĂŠs"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "installer tous les fichiers, meme si les configurations disent le contraire"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1836,160 +1920,169 @@ msgstr ""
 "retirer tous les paquetages qui correspondent Ă  <paquetage> (normalement on "
 "retourne une erreur si le <paquetage> correspond Ă  plusieurs paquetages"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr "utiliser la \"prĂŠsentation\" d'anaconda"
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "ne pas exĂŠcuter le(s) scriptlet(s) du paquetages"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "reloger des fichiers d'un paquetage non relogeable"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 "sauver les fichiers du paquetage dĂŠsinstallĂŠ en les renommant dans un sous-"
 "rĂŠpertoire"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "dĂŠsinstaller un paquetage"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<paquetage>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 msgid "do not install configuration files"
 msgstr "ne pas installer les fichiers de configuration"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "ne pas installer la documentation"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "sauter les fichiers commence par le <chemin> indiquĂŠ"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<chemin>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "reloger des fichiers d'un paquetage non relogeable"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "raccourci pour --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "met Ă  jour le(s) paquetage(s) dĂŠjĂ  installĂŠ(s)"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<paquetage>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "afficher des marqueurs au fur et Ă  mesure que le paquetage s'installe (avec -"
 "v c'est bien(tm))"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "ne pas vĂŠrifier l'architecture du paquetage"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "ne pas vÊrifier le système d'exploitation du paquetage"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "ne pas vĂŠrifier l'espace disque avant l'installation"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "installer la documentation"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 msgid "install package(s)"
 msgstr "installer le(s) paquetage(s)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 "mettre à jour la base donnÊes, mais ne pas modifier le système de fichiers"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "ne pas vĂŠrifier les dĂŠpendances du paquetage"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "ne pas vĂŠrifier les sommes MD5 des fichiers"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "ne pas installer les fichiers de configuration"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "ne pas rĂŠ-arranger l'ordre d'installation des paquetages pour satisfaire les "
 "dĂŠpendances"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "ne pas suggĂŠrer de rĂŠsolution pour les dĂŠpendances manquantes"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "ne pas exĂŠcuter le scriptlet %%pre (s'il existe)"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "ne pas exĂŠcuter le scriptlet %%post (s'il existe)"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "ne pas exĂŠcuter le scriptlet %%preun (s'il existe)"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "ne pas exĂŠcuter le scriptlet %%postun (s'il existe)"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "n'exĂŠcuter aucun scriptlet trigger activĂŠ par ce paquetage"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "n'exĂŠcuter aucun scriplet %%triggerprein"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "n'exĂŠcuter aucun scriplet %%triggerin"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "n'exĂŠcuter aucun scriptlet %%triggerun"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "n'exĂŠcuter aucun scriptlet %%triggerpostun"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1997,469 +2090,489 @@ msgstr ""
 "mettre à jour avec un paquetage plus ancien (une m-à-j avec --force fait ça "
 "automatiquement"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "afficher le pourcentage d'installation du paquetage"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "reloge le paquetage vers <rep>, si relogeable"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<rep>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "reloge les fichiers du <vieux> chemin vers <nouveau>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<vieux>=<nouveau>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 "sauvegarder les fichiers du paquetage dĂŠsinstallĂŠ en les rĂŠ-empaquetant"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "installer mĂŞme si le paquetage remplace des fichiers installĂŠs"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "rĂŠinstalle si le paquetage est dĂŠjĂ  installĂŠ"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 "dĂŠsinstaller le(s) nouveau(x), rĂŠ-installer le(s) vieux paquetages, comme "
 "c'ĂŠtait le cas pour cette <date>"
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr "<date>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "n'installe pas, mais dit si ça marcherait ou pas"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "mises Ă  jour des paquetages"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "vĂŠrifier/demander Ă  tous les paquetages"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 msgid "rpm checksig mode"
 msgstr "mode rpm vĂŠrifsign"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "vÊrifier/demander un package possèdant un fichier"
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
-msgstr ""
-"questionner/vÊrifier le(s) paquetage(s) grâce à un identifieur de fichier"
-
-#: lib/poptQV.c:103
+#: lib/poptQV.c:108
 msgid "query/verify package(s) in group"
 msgstr "vĂŠrifier/questionner le(s) paquetage(s) d'un mĂŞme groupe"
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
-msgstr ""
-"questionner/vÊrifier le(s) paquetage(s) grâce à un identifieur d'entête"
-
-#: lib/poptQV.c:107
+#: lib/poptQV.c:110
 msgid "query/verify a package file"
 msgstr "vĂŠrifier/questionner un fichier paquetage"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
+msgstr ""
+"questionner/vĂŠrifier le(s) paquetage(s) Ă  partir de la transaction "
+"d'installation"
+
+#: lib/poptQV.c:115
+#, fuzzy
+msgid "query/verify package(s) from system HDLIST"
+msgstr ""
+"questionner/vĂŠrifier le(s) paquetage(s) Ă  partir de la transaction "
+"d'installation"
+
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr ""
 "questionner/vÊrifier le(s) paquetage(s) grâce à un identifieur de paquetage"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr ""
+"questionner/vÊrifier le(s) paquetage(s) grâce à un identifieur d'entête"
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr ""
+"questionner/vÊrifier le(s) paquetage(s) grâce à un identifieur de fichier"
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "mode de requĂŞte de rpm"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 msgid "query/verify a header instance"
 msgstr "questionner/vĂŠrifier une instance d'entĂŞte"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "questionner un fichier spec"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<spec>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr ""
 "questionner/vĂŠrifier le(s) paquetage(s) Ă  partir de la transaction "
 "d'installation"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "questionner le(s) paquetage(s) surveillĂŠ(s) par le paquetage"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "mode de vĂŠrification de rpm"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "vĂŠrifier/demander le(s) paquetage(s) qui requier(en)t une dĂŠpendance"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "vĂŠrifier/demander le(s) paquetage(s) qui fourni(ssen)t une dĂŠpendance"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "aucun argument fourni"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: impossible de lire l'entĂŞte Ă  0x%x\n"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "lister les fichiers de configuration"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "lister les fichiers documents"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "dĂŠbite les informations de base des fichiers"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "lister les fichiers du paquetage"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr "ĂŠviter les fichiers fantĂ´mes %%ghost"
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr "ĂŠviter les fichiers %%license"
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr "ĂŠviter les fichier %%readme"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "utiliser le format de requĂŞte suivant"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "substituer les section i18n dans le fichier spec"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "affiche la liste des fichiers et leur ĂŠtat"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "ne pas vĂŠrifier la taille des fichiers"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "ne pas vĂŠrifier le chemin du lien symbolique des fichiers"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "ne pas vĂŠrifier le possesseur des fichiers"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "ne pas vĂŠrifier le groupe possesseur des fichiers"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "ne pas vĂŠrifier les dates de modification des fichiers"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "ne pas vĂŠrifier les permissions des fichiers"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "ne pas vĂŠrifier les fichiers du paquetage"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "ne pas vĂŠrifier les fichiers du paquetage"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "ne pas vĂŠrifier les dĂŠpendances du paquetage"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 msgid "don't execute verify script(s)"
 msgstr "ne pas exĂŠcuter le(s) script(s) de vĂŠrification"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ne pas vĂŠrifier la(les) signature(s) GPG V3 DSA"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ne pas vĂŠrifier la(les) signature(s) PGP V3 RSA/MD5"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 msgid "sign package(s) (identical to --resign)"
 msgstr "signer le(s) paquetage(s) (identique Ă  --resign)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 msgid "verify package signature(s)"
 msgstr "vĂŠrifier la(les) signature(s) du paquetage"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr "importer une clĂŠ publique blindĂŠ"
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signer le(s) paquetage(s) (identique Ă  --addsign)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "gĂŠnĂŠration de signature"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr "paquetage source attendu, paquetage binaire trouvĂŠ\n"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "le paquetage source ne contient pas de fichier .spec\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
-#, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: %s(%s-%s-%s) dĂŠbut du scriplet %ssynchrone\n"
+
+#: lib/psm.c:736
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s) redondance ignorĂŠe \"%s\".\n"
 
-#: lib/psm.c:639
-#, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+#: lib/psm.c:744
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s) dĂŠbut du scriplet %ssynchrone\n"
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
-#, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+#: lib/psm.c:990
+#, fuzzy, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s) ĂŠchec du scriptlet, waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:857
-#, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+#: lib/psm.c:996
+#, fuzzy, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s) ĂŠchec du scriplet, code de sortie %d\n"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s avait %d fichiers, test = %d\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: ĂŠchec du scriptlet %s (%d), on saute %s\n"
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 msgid "Unable to reload signature header\n"
 msgstr "Impossible de recharger l'entĂŞte de signature\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ĂŠchec du dĂŠballage de l'archive %s%s: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " dans fichier "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "ĂŠchec de %s sur le fichier %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "ĂŠchec %s: %s\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "format incorrect: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(ne contient pas de fichier)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "remplacĂŠ      "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "non installĂŠ  "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "sur le rĂŠseau "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr "fausse couleur"
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(pas d'ĂŠtat)  "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(%3d iconnu)  "
 
-#: lib/query.c:266
+#: lib/query.c:271
 msgid "package has not file owner/group lists\n"
 msgstr "le paquetage n'as pas de liste de possesseurs/groupes de fichiers\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 "le paquetage n'a ni la liste des id ni celle des possesseurs de fichiers\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "ĂŠchec de l'ouverture de %s: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "ĂŠchec de la requĂŞte sur %s\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-"les vieux formats de paquetage source ne peuvent ĂŞtre sujet aux requĂŞtes\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "%s: n'est pas un paquetage rpm (ni une list de paquetages): %s\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "aucun paquetage\n"
-
-#: lib/query.c:535
-#, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "tag inconnu: \"%s\"\n"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "le groupe %s ne contient aucun paquetage\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "aucun paquetage ne surveille %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s malformĂŠ: %s\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "aucun paquetage ne correspond Ă  %s: %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "aucun paquetage ne requiert %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "aucun paquetage ne fournit %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fichier %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "le fichier %s n'appartient Ă  aucun paquetage\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "numĂŠro de paquetage invalide: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "numĂŠro d'article de paquetage: %u\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "impossible de lire l'article %u\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "le paquetage %s n'est pas installĂŠ\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr "(fichiers ajoutĂŠs)"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr "(fourniture ajoutĂŠe)"
 
@@ -2556,15 +2669,15 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr "NON"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr "OUI"
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2574,13 +2687,13 @@ msgstr ""
 "pour \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "le paquetage %s a un(e) %s non-satisfaites: %s\n"
@@ -2590,155 +2703,184 @@ msgstr "le paquetage %s a un(e) %s non-satisfaites: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorĂŠ Ă  cause du drapeau missingok\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr "========== relogements\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d exclus  %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d reloge %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "exclusion de %s %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "relogement de %s vers %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "relogement du rĂŠpertoire %s vers %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "ĂŠchec de l'ouverture de %s: %s\n"
+
+#: lib/rpmgi.c:355
+#, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "tag inconnu: \"%s\"\n"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+msgid "Failed dependencies:\n"
+msgstr "DĂŠpendances requises:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr "    RĂŠsolutions suggĂŠrĂŠes:\n"
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "PrĂŠparation...              "
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr "PrĂŠparation des paquetages pour l'installation..."
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr "RĂŠ-emballage..."
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr "RĂŠ-emballage des fichiers effacĂŠs..."
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr "Mise Ă  jour..."
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 msgid "Upgrading packages..."
 msgstr "Mise Ă  jour des paquetages..."
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "Nouveau but: %s\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "RĂŠcupĂŠration de %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... en tant que %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ignorĂŠ - ĂŠchec du tĂŠlĂŠchargement - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ne peut ĂŞtre installĂŠ\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<paquetage source>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "le paquetage %s n'est pas relogeable\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "installation des paquetages binaires\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "erreur en lisant %s\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "le fichier %s demande une version plus rĂŠcente de RPM\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "%s: n'est pas un paquetage rpm (ni une list de paquetages): %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d paquetage(s) source(s) et %d paquetage(s) binaire(s) trouvĂŠ(s)\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-msgid "Failed dependencies:\n"
-msgstr "DĂŠpendances requises:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr "    RĂŠsolutions suggĂŠrĂŠes:\n"
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "installation des paquetages binaires\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ne peut ouvrir le fichier %s: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spĂŠcifie plusieurs paquetages\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installation de %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 "Roulement arrière des paquetages (+%d/-%d) jusqu'à %-24.24s (0x%08x):\n"
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "RĂŠcupĂŠration de %s\n"
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2757,7 +2899,8 @@ msgstr ""
 "IndexRep), pas en tant que chemin."
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+#, fuzzy
+msgid "package payload can be compressed using bzip2."
 msgstr "La charge utile du paquetage est compressĂŠe avec bzip2."
 
 #: lib/rpmlibprov.c:38
@@ -2788,6 +2931,11 @@ msgstr ""
 "les scriptlets du paquetage pourrait accĂŠder Ă  la base de donnĂŠes rpm "
 "pendant l'installation."
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- non supportÊ sur des chaÎnes de caractères\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2848,7 +2996,8 @@ msgstr ""
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
-"Êchec du(des) appel(s) système(s) de la prÊ-transaction du paquetage %s: %s: %s"
+"Êchec du(des) appel(s) système(s) de la prÊ-transaction du paquetage %s: %s: "
+"%s"
 
 #: lib/rpmps.c:262
 #, c-format
@@ -2869,174 +3018,229 @@ msgstr "%s entre en conflit avec %s%s"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "erreur %d inconnue rencontrĂŠe en manipulant le paquetage %s"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "il manque un second ':' Ă  %s:%d\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "architecture manquante Ă  %s:%d\n"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ligne de donnÊes incomplète à %s:%d\n"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Trop d'arguments dans la ligne de donnĂŠes Ă  %s:%d\n"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Mauvais numĂŠro d'arch/OS: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "valeur par dÊfaut imcomplète à la ligne %s:%d\n"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Trop d'arguments pour la valeur par dĂŠfaut de la ligne %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Impossible de lire %s: %s.\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "':' manquant (trouvĂŠ 0x%02x) Ă  %s:%d\n"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "argument manquant pour %s Ă  %s:%d\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "ĂŠchec de l'expansion de %s Ă  %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "Impossible d'ouvrir %s Ă  %s:%d: %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "architecture manquante pour %s Ă  %s:%d\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "mauvaise option '%s' Ă  %s:%d\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "système inconnu: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Contactez rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Impossible d'expanser %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Impossible de lire %s, HOME trop gros.\n"
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Impossible d'ouvrir %s en lecture: %s.\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "impossible d'ouvrir la base de donnĂŠes Package dans %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "'(' supplĂŠmentaire dans le label du paquetage: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "'(' manquante dans le label du paquetage: %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "')' manquante dans le label du paquetage: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "Impossible d'ouvrir la base de donnĂŠes Solve dans %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, c-format
 msgid "Adding: %s\n"
 msgstr "Ajout de: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Suggestion: %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr "systèmes de fichiers montÊs:\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr "%5d 0x%04x %5u %12ld %12ld %s\n"
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "relogement de %s vers %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3053,6 +3257,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "taille du sigh(%d): PASBON, la lecture retourne %d\n"
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3077,6 +3282,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3144,6 +3350,9 @@ msgstr "J'ai %d octets de sig GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3171,41 +3380,164 @@ msgstr "Taille de EntĂŞte+Charge_utile: "
 msgid "MD5 digest: "
 msgstr "Somme MD5: "
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 msgid "Header SHA1 digest: "
 msgstr "Hachage de l'entĂŞte SHA1: "
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 msgid "V3 RSA/MD5 signature: "
 msgstr "signature V3 RSA/MD5: "
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr "EntĂŞte "
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr "signature V3 DSA: "
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verification de signature: MAUVAIS PARAMETRES\n"
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Somme MD5 erronĂŠe: NONSUPPORTE\n"
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signature: INCONNUE (%d)\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "rĂŠpertoire %s exclus\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "paquetage source attendu, paquetage binaire trouvĂŠ\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "aucun paquetage ne correspond Ă  %s: %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<paquetage source>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<paquetage source>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "erreur dans la lecteur de l'entĂŞte du paquetage\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3214,11 +3546,15 @@ msgstr "rĂŠpertoire %s exclus\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "vĂŠrification de santĂŠ de %d ĂŠlĂŠments\n"
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3227,7 +3563,7 @@ msgstr "vĂŠrification de santĂŠ de %d ĂŠlĂŠments\n"
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "calcul de %d empreintes de fichier\n"
@@ -3235,13 +3571,37 @@ msgstr "calcul de %d empreintes de fichier\n"
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr "calcul de la disposition des fichiers\n"
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
-#, c-format
-msgid "missing  %c %s"
+#, fuzzy, c-format
+msgid "missing   %c %s"
 msgstr "manquant %c %s"
 
 #: lib/verify.c:437
@@ -3274,137 +3634,137 @@ msgstr "enlèvement db environnement %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "ouverture  db environnement %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "fermeture     index db    %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "vĂŠrif.     db index       %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 "trouvĂŠs(%d) mutex posix non-partagĂŠs, rajout de DB_PRIVATE, utilisation des "
 "verrous fcntl\n"
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "ouverture     index db    %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "impossible d'avoir le verrou %s sur %s/%s\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "exclusif"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "partagĂŠ"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "verrouillage  index db    %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "options de db inconnues: \"%s\" ignorĂŠ.\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s est une valeur numĂŠrique invalide, ignorĂŠ\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s est une valeur 'long' trop petite ou trop grande, ignorĂŠ\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s est une valeur entière trop petite ou trop grande, ignorÊ\n"
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "{ manquant après %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "} manquant après %{"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "tag format vide"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "tag name vide"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "tag inconnu"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "] attendu Ă  la fin du tableau"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "] innatendu"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "} innatendu"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "? attendu dans l'expression"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "{ attendu après ? dans l'expression"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "} attendu dnas l'expression"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ": attendu derrière la sous-expression de ?"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "{ attendu après : dans l'expression"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "| attendu a la fin de l'expression"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr "(index hors bornes)"
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr "itĂŠrateur de tableau utilisĂŠ avec des tableaux de tailles diffĂŠrentes"
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3431,329 +3791,329 @@ msgstr "vĂŠrifier les fichiers de la base de donnĂŠes"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "gĂŠnĂŠrer un entĂŞte compatible avec l'emballage rpm[23]"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nom de tag non-reconnu: \"%s\" ignorĂŠ\n"
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "ne peut ouvrir l'index %s en utilisant db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "ne peut ouvrir l'index %s\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr "aucun dbpath n'a ĂŠtĂŠ fourni\n"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "erreur(%d) en attrapant les articles \"%s\" de l'index %s\n"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: on saute"
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "erreur(%d) en stockant l'article nÂş%d dans %s\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: on saute"
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: l'entĂŞte nÂş%u endommagĂŠ a ĂŠtĂŠ tĂŠlĂŠchargĂŠ -- ignorĂŠ.\n"
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: impossible de lire l'entĂŞte Ă  0x%x\n"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 "erreur(%d) en affectant l'article de l'entête nº%d pour l'enlèvement de %s\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "enlèvement \"%s\" à l'index %s.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "enlèvement de %d entrÊes à l'index %s.\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "erreur(%d) en affectant les articles \"%s\" de l'index %s\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erreur(%d) en stockant l'article \"%s\" dans %s\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erreur(%d) en enlevant l'article \"%s\" de %s\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erreur(%d) en allouant une nouvelle instance de paquetage\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: on saute"
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "rajout de \"%s\" Ă  l'index %s.\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "rajout de %d entrĂŠes Ă  l'index %s.\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erreur(%d) en stockant l'article %s dans %s\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "enlèvement de %s après la reconstruction rÊussie en db3.\n"
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "aucun dbpath fourni"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstruction de la base de donnĂŠes de %s en %s\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "la base de donnĂŠes temporarire %s existe dĂŠjĂ \n"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr "crĂŠation du rĂŠpertoire %s\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "crĂŠation du rĂŠpertoire %s: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ouverture d'une vieille base de donnĂŠes avec dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ouverture d'une nouvelle base de donnĂŠes avec dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "l'entĂŞte nÂş%u dans la base de donnĂŠes n'est pas bon -- ignorĂŠ.\n"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "impossible d'ajouter l'article qui ĂŠtait au dĂŠpart Ă  %u\n"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "Ne peut reconstruire la base de donnĂŠes: la base originale reste telle "
 "qu'elle est\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "Ne peut remplacer la vieille base de donnĂŠes par la nouvelle!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 "remplacer les fichiers dans %s avec les fichiers de %s pour faire une "
 "rĂŠcupĂŠration"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr "destruction du rĂŠpertoire %s\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Ne peut dĂŠtruire le rĂŠpertoire %s: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d actif(s) %d vide(s)\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(vide)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vide)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "La macro %%%s a un corps sans fin\n"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "La macro %%%s a un nom illĂŠgal (%%define)\n"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "La macro %%%s a des options non-terminĂŠes\n"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "La macro %%%s a un corps vide\n"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "La macro %%%s ne peut ĂŞtre expansĂŠe\n"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "La macro %%%s a un nom illĂŠgal (%%undefine)\n"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "La macro %%%s (%s) n'est plus utilisĂŠe en dessous du niveau %d\n"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Option inconnue %c dans %s(%s)\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Profondeur de rĂŠcursion(%d) plus grande que le max(%d)\n"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c non terminĂŠ: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un %% est suivi d'une macro in-analysable\n"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Macro %%%.*s non trouvĂŠ, ignorĂŠ\n"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "Tampon cible en surcharge\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Fichier %s: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Le fichier %s est plus petit que %u octets\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "Succès"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Mauvaise rĂŠponse du serveur"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr "Erreur d'E/S avec le serveur"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "Timeout du serveur"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "Impossible de rĂŠsoudre l'adresse IP du serveur"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "Impossible de retrouver le nom d'hĂ´te du serveur"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "Impossible de se connecter au serveur"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "Impossible d'ĂŠtablir une connexion de donnĂŠes avec le serveur"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr "erreur d'E/S dans le fichier local"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Erreur en mettant le serveur distant en mode passif"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Fichier non trouvĂŠ sur le serveur"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "Abandon en cours"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "Erreur inconnue ou inattendue"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "connexion Ă  %s en tant que %s, mdp %s\n"
@@ -3763,6 +4123,7 @@ msgid "(no error)"
 msgstr "(pas d'erreur)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "erreur fatale: "
@@ -3782,93 +4143,62 @@ msgstr "attention: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "l'allocation de mĂŠmoire (%u octets) a retournĂŠ NULL.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "attention: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "attention: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "attention: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Mot de passe pour %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "erreur: le port (%s) doit ĂŞtre un nombre\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "le port dans l'url doit ĂŞtre un nombre\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "ĂŠchec de la crĂŠation de %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 msgid "don't verify header+payload signature"
 msgstr "ne pas vĂŠrifier la signature de l'entete+charge_utile"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 "ne pas mettre Ă  jour le cache de la base de donnĂŠes, afficher seulement les "
 "chemins du paquetage"
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr "suivre les liens symboliques de la ligne de commande"
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr "marche logique"
-
-#: tools/rpmcache.c:528
-msgid "don't change directories"
-msgstr "ne pas modifier les rĂŠpertoires"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr "ne pas prendre les info stat"
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr "marche physique"
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr "renvoyer point et point-point"
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr "ne mĂŠlanger pas les pĂŠriphĂŠriques"
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr "ne pas renvoyer d'information"
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr "Options communes a tous les modes et executables rpm:"
+#: tools/rpmcache.c:519
+#, fuzzy
+msgid "File tree walk options:"
+msgstr "Otions de signatures"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: la macro %%{_cache_dbpath} est mal configurĂŠe.\n"
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ĂŠchec de l'opĂŠration sur le cache: ec %d.\n"
@@ -3969,3 +4299,26 @@ msgstr "utiliser la base de donnĂŠes dans REPERTOIRE"
 #: ../rpmpopt:410 ../rpmpopt:418
 msgid "DIRECTORY"
 msgstr "REPERTOIRE"
+
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "Options communes Ă  tous les modes de rpm:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr ""
+#~ "--replacefiles ne peut ĂŞtre utilisĂŠ qu'Ă  l'installation de paquetages"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "ligne %d: nom de fichier non permis: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "installer mĂŞme si le paquetage remplace des fichiers installĂŠs"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "ĂŠchec de la requĂŞte sur %s\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr ""
+#~ "les vieux formats de paquetage source ne peuvent ĂŞtre sujet aux requĂŞtes\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "aucun paquetage\n"
diff --git a/po/gl.po b/po/gl.po
index 5681c6f93..58a95a004 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 msgid "Failed build dependencies:\n"
@@ -62,10 +62,12 @@ msgid "Building for target %s\n"
 msgstr ""
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr ""
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr ""
 
@@ -82,253 +84,264 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:137
+#: rpmqv.c:145
+#, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr ""
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -404,176 +417,176 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr ""
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr ""
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr ""
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr ""
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr ""
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr ""
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr ""
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -627,7 +640,7 @@ msgstr ""
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
@@ -637,122 +650,122 @@ msgstr ""
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:485
+#: build/pack.c:499
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:504
+#: build/pack.c:518
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:550
+#: build/pack.c:564
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:588
+#: build/pack.c:602
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -797,17 +810,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -827,123 +840,128 @@ msgstr ""
 msgid "line %d: Second %%files list\n"
 msgstr ""
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1022,82 +1040,87 @@ msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
 msgstr ""
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr ""
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr ""
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr ""
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr ""
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr ""
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr ""
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr ""
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr ""
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1222,18 +1245,18 @@ msgstr ""
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 msgid "don't verify package signature(s)"
 msgstr ""
 
@@ -1331,78 +1354,89 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:219
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr ""
 
@@ -1414,7 +1448,7 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr ""
 
@@ -1422,7 +1456,7 @@ msgstr ""
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 msgid "(not an OpenPGP signature)"
 msgstr ""
 
@@ -1441,7 +1475,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr ""
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
@@ -1515,863 +1549,925 @@ msgstr ""
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, c-format
+msgid "adding %d args from manifest.\n"
+msgstr ""
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr ""
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr ""
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr ""
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 msgid "send stdout to CMD"
 msgstr ""
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr ""
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 msgid "add suggested packages to transaction"
 msgstr ""
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 msgid "do not install configuration files"
 msgstr ""
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+msgid "detect file conflicts between packages"
+msgstr ""
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 msgid "don't install file security contexts"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr ""
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr ""
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 msgid "rpm checksig mode"
 msgstr ""
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr ""
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
+#: lib/poptQV.c:108
+msgid "query/verify package(s) in group"
 msgstr ""
 
-#: lib/poptQV.c:103
-msgid "query/verify package(s) in group"
+#: lib/poptQV.c:110
+msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
+#: lib/poptQV.c:113
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr ""
 
-#: lib/poptQV.c:107
-msgid "query/verify a package file"
+#: lib/poptQV.c:115
+msgid "query/verify package(s) from system HDLIST"
 msgstr ""
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr ""
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr ""
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr ""
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 msgid "query/verify a header instance"
 msgstr ""
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr ""
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+msgid "do not glob arguments"
+msgstr ""
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+msgid "do not read headers"
+msgstr ""
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 msgid "don't verify file security contexts"
 msgstr ""
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr ""
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 msgid "Unable to reload signature header\n"
 msgstr ""
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:266
+#: lib/query.c:271
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr ""
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr ""
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr ""
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr ""
-
-#: lib/query.c:535
-#, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr ""
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2468,28 +2564,28 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2499,154 +2595,183 @@ msgstr ""
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr ""
+
+#: lib/rpmgi.c:355
+#, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr ""
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+msgid "Failed dependencies:\n"
+msgstr ""
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 msgid "Upgrading packages..."
 msgstr ""
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr ""
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
 #, c-format
-msgid "found %d source and %d binary packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-msgid "Failed dependencies:\n"
+msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
+#: lib/rpminstall.c:638
+#, c-format
+msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, c-format
+msgid "\tRemoving %s:\n"
+msgstr ""
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2661,7 +2786,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2688,6 +2813,10 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+msgid "internal support for lua scripts."
+msgstr ""
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2762,174 +2891,229 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr ""
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, c-format
 msgid "Adding: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr ""
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -2946,6 +3130,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -2970,6 +3155,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3037,6 +3223,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3060,41 +3249,162 @@ msgstr ""
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+msgid "\tRepackaged package not found!.\n"
+msgstr ""
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+msgid "Failure reading repackaged package!\n"
+msgstr ""
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3103,11 +3413,15 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3116,7 +3430,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3124,13 +3438,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr ""
 
 #: lib/verify.c:437
@@ -3163,135 +3501,135 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr ""
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr ""
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr ""
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr ""
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr ""
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3316,324 +3654,324 @@ msgstr ""
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3643,6 +3981,7 @@ msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr ""
@@ -3662,91 +4001,59 @@ msgstr ""
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-msgid "don't change directories"
-msgstr ""
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 4511706f1..ef185e658 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -63,10 +63,12 @@ msgid "Building for target %s\n"
 msgstr "Ţýđi fyrir markkerfi %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr ""
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr ""
 
@@ -83,255 +85,264 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM útgáfa %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Höfundarréttur (C) 1998-2000 - Red Hat Inc"
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Ţessu má dreifa frjálst samkvćmt skilmálum GNU GPL"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr ""
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Get ekki opnađ tempi skrá.\n"
 
@@ -407,176 +418,176 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr ""
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "vantar '(' í  %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "vantar ')' í %s %s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ógilt %s tákn: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "vantar '(' í  %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Tvćr skrár á einni línu: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Skráin er tvítekin: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Skráin fannst ekki: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Gat ekki opnađ PreUn skrá: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Skráin fannst ekki međ 'glob': %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Gat ekki opnađ %%files skrána %s: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "lína: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ógild skrá %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -630,7 +641,7 @@ msgstr ""
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Gat ekki opnađ PreIn skrá: %s\n"
@@ -640,126 +651,126 @@ msgstr "Gat ekki opnađ PreIn skrá: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Gat ekki opnađ PreUn skrá: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Gat ekki opnađ PostIn skrá: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Gat ekki opnađ PostUn skrá: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Get ekki opnađ VerifyScript skrá: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Get ekki lesiđ haus úr %s: %s\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Gat ekki ritađ haus í %s: %s\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Gat ekki ritađ haus í %s: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Get ekki lesiđ haus úr %s: %s\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki ritađ í pakka: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Get ekki opnađ sigtarget %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Get ekki lesiđ haus úr %s: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Gat ekki ritađ haus í %s: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Get ekki lesiđ innihald %s: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki ritađ innihald í %s: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifađi: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -804,17 +815,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "lína %d: Óleyfilegur rofi %s: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -834,123 +845,128 @@ msgstr ""
 msgid "line %d: Second %%files list\n"
 msgstr ""
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Get ekki opnađ táknmynd %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Gat ekki lesiđ táknmynd %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Óţekkt tegund táknmyndar: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "lína %d: Tag tekur einungis eitt tákn: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "lína %d: Skemmt tag: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "lína %d: Tómt tag: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "lína %d: Ólöglegt tákn '-' í %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "lína %d: Epoch/Serial svćđiđ verđur ađ innihalda tölu: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1029,82 +1045,87 @@ msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
 msgstr ""
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr ""
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr ""
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr ""
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr ""
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "lína %d: Villa viđ ţáttun %s: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "lína %d: Epoch/Serial svćđiđ verđur ađ innihalda tölu: %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr ""
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "lína %d: Skemmt tag: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "lína %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Get ekki opnađ %s: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1230,20 +1251,20 @@ msgstr "ekki skođa pakkaskilyrđin"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "ekki skođa pakkaskilyrđin"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "ekki skođa pakkaskilyrđin"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "ekki skođa pakkaskilyrđin"
@@ -1342,79 +1363,90 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "get ekki opnađ pakka gagnagrunn í\n"
+
+#: lib/depends.c:219
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "uppfćra pakka"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr ""
 
@@ -1426,7 +1458,7 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr ""
 
@@ -1434,7 +1466,7 @@ msgstr ""
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "búa til undirskrift"
@@ -1454,7 +1486,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr "gat ekki skođađ %s: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "gat ekki opnađ %s: %s\n"
@@ -1528,880 +1560,944 @@ msgstr "%s gat ekki eytt %s: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s búiđ til sem %s\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, c-format
+msgid "adding %d args from manifest.\n"
+msgstr ""
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "gat ekki búiđ til %%%s %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki ritađ í %%%s %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s rmdir %s brást: %s\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: Fseek brást: %s\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr ""
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "prenta útvíkkun fjölva <expr>+"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "senda frálag í <skipun>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "sýna endanlega rpmrc og stillingar fjölva"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "prenta útgáfunúmer rpm sem veriđ er ađ nota"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr ""
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<pakkaskrá>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "birta einungis stillingaskrár (innifelur -l)"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+msgid "detect file conflicts between packages"
+msgstr ""
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<pakkaskrá>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "setja inn pakka"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "ekki yfirfara MD5 undirritun skráa"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "birta einungis stillingaskrár (innifelur -l)"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<gömul>=<ný>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "uppfćra pakka"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr ""
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 msgid "rpm checksig mode"
 msgstr ""
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
-#: lib/poptQV.c:101
-#, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
-
-#: lib/poptQV.c:103
+#: lib/poptQV.c:108
 msgid "query/verify package(s) in group"
 msgstr ""
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify a package file"
 msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:113
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:115
+#, fuzzy
+msgid "query/verify package(s) from system HDLIST"
+msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
+
+#: lib/poptQV.c:118
 #, fuzzy
 msgid "query/verify package(s) with package identifier"
 msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+#, fuzzy
+msgid "query/verify package(s) with header identifier"
+msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
+
+#: lib/poptQV.c:122
+#, fuzzy
+msgid "query/verify package(s) with file identifier"
+msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "fyrirspurn/yfirferđ á pakkana sem hafa pakkaţarfir"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "fyrirspurn/yfirferđ á pakkana sem uppfylla ţarfir annara pakka"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+msgid "do not glob arguments"
+msgstr ""
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+msgid "do not read headers"
+msgstr ""
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "ekki yfirfara stćrđ skráa"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "ekki yfirfara symlink slóđ skráa"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "ekki yfirfara eiganda skráa"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "ekki yfirfara hop skráa"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "ekki yfirfara heimildir skráa"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "ekki yfirfara skrárnar í pakkanum"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "ekki yfirfara skrárnar í pakkanum"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "ekki skođa pakkaskilyrđin"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ekki yfirfara SHA1 undirritunina"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ekki yfirfara MD5 undirritun skráa"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "búa til undirskrift"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "búa til undirskrift"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skrá\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:956
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:857
+#: lib/psm.c:990
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:1288
+#: lib/psm.c:996
+#, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Get ekki lesiđ haus úr %s: %s\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opnađ %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s brást\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:266
+#: lib/query.c:271
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr ""
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr ""
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "get ekki opnađ pakka gagnagrunn í\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr ""
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "Óţekkt tegund táknmyndar: %s\n"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Get ekki lesiđ %s: %s.\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "get ekki opnađ pakka gagnagrunn í\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2498,28 +2594,28 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "get ekki opnađ pakka gagnagrunn í\n"
@@ -2529,156 +2625,185 @@ msgstr "get ekki opnađ pakka gagnagrunn í\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d fćra %s -> %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d fćra %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "lína %d: %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "%5d fćra %s -> %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%5d fćra %s -> %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr ""
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "Óţekkt tegund táknmyndar: %s\n"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "gat ekki útbúiđ pakkaskilyrđi:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "uppfćra pakka"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Skrá %s: %s\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "Get ekki ritađ í pakka: %s\n"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "Skráin %s er ekki venjuleg skrá.\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "get ekki opnađ pakka gagnagrunn í\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "gat ekki útbúiđ pakkaskilyrđi:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, c-format
+msgid "\tRemoving %s:\n"
+msgstr ""
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2693,7 +2818,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2720,6 +2845,10 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+msgid "internal support for lua scripts."
+msgstr ""
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2794,174 +2923,229 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "vantar seinni ':' á %s:%d\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Get ekki lesiđ %s: %s.\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "viđfang vantar fyrir %s á %s:%d\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "get ekki opnađ %s á %s:%d: %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ólöglegur rofi '%s' á %s:%d\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Get ekki opnađ %s til lesturs: %s.\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "get ekki opnađ pakka gagnagrunn í %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "vantar '(' í  %s %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "vantar '(' í  %s %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "get ekki opnađ pakka gagnagrunn í %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "lína: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "%5d fćra %s -> %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -2978,6 +3162,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3002,6 +3187,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3069,6 +3255,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3092,42 +3281,163 @@ msgstr ""
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "ekki yfirfara SHA1 undirritunina"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+msgid "\tRepackaged package not found!.\n"
+msgstr ""
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "get ekki opnađ pakka gagnagrunn í\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "Get ekki ritađ í pakka: %s\n"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "Get ekki ritađ í pakka: %s\n"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+msgid "Failure reading repackaged package!\n"
+msgstr ""
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3136,11 +3446,15 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3149,7 +3463,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3157,13 +3471,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "vantar     %s"
 
 #: lib/verify.c:437
@@ -3196,135 +3534,135 @@ msgstr "fjarlćgđi gagnagrunnsumhverfi %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "opna gagnagrunnsumhverfi %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "einka"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "deildann"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr ""
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr ""
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr ""
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr ""
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr ""
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3349,324 +3687,324 @@ msgstr ""
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "get ekki opnađ %s index međ db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "get ekki opnađ %s index\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== virkt %d tómt %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tómt)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tómt)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Óţekkt viđfang %c í %s(%s)\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Fjölvi %%%.*s fannst ekki. Sleppi\n"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Skrá %s: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Skráin %s er minni en %u bćti\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "Tókst"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Ţjónninn svarađi rangt"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr "Les/ritvilla á ţjóninum"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "Ţjónninn tímađi út"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "Gat ekki flett upp vistfangi ţjónsins"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "Gat ekki flett upp heiti ţjónsins"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "Gat ekki tengst ţjóninum"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "Gat ekki opnađ gagnatengingu viđ ţjóninn"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr "Les/ritvilla í skrána"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Ekki tókst ađ fá ţjóninn í \"passive\" ham"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Skráin fannst ekki á ţjóninum"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "Er ađ hćtta viđ"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "Óţekkt eđa óvćnt villa"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "tengist %s sem %s međ ađgangsorđi %s\n"
@@ -3676,6 +4014,7 @@ msgid "(no error)"
 msgstr "(engin villa)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "banvćn villa: "
@@ -3695,92 +4034,60 @@ msgstr "ađvörun: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "minnisfrátekt (%u bćta) skilađi NULL.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "ađvörun: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "ađvörun: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, fuzzy, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "ađvörun: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lykilorđ fyrir %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "villa: %sport verđur ađ vera tala\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "gátt slóđar verđur ađ vera tala\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "gat ekki búiđ til %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "ekki skođa pakkaskilyrđin"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-msgid "don't change directories"
-msgstr ""
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Fseek brást: %s\n"
diff --git a/po/ja.po b/po/ja.po
index f260262cd..afea93299 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: EUC-JP\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -67,12 +67,12 @@ msgid "Building for target %s\n"
 msgstr "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
 
 #: rpm2cpio.c:55
-#, fuzzy
+#, fuzzy, c-format
 msgid "argument is not an RPM package\n"
 msgstr "°úżô¤Ď RPM ĽŃĽĂĽąĄźĽ¸¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
 
 #: rpm2cpio.c:60
-#, fuzzy
+#, fuzzy, c-format
 msgid "error reading header from package\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ť¤éĽŘĽĂĽŔ¤ÎĆɤߚţ¤ß¤ÎĽ¨ĽéĄź\n"
 
@@ -89,95 +89,103 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 #, fuzzy
 msgid "Signature options:"
 msgstr "˝đĚžĽľĽ¤Ľş: %d\n"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ĽĐĄźĽ¸ĽçĽó %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 "Ăřşî¸˘ (C) 1998 - Red Hat Software\n"
 "ËÝĚőźÔ żŔĹÄ ˝ź <kanda@nn.iij4u.or.jp>\n"
 "¸íĚőĹů¤ĎżŔĹĤޤÇ"
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "GNU°ěČ̸řÍ­ťČÍŃľöÂú˝ń¤Î˛ź¤ÇźŤÍł¤ËÇŰÉۤǤ­¤Ţ¤š"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, fuzzy, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "°úżô˝čÍý(%d)¤Ç¤ÎĆâÉôĽ¨ĽéĄź :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "°ě¤Ä¤ÎĽáĽ¸ĽăĄźĽâĄźĽÉ¤Î¤ß¤ňťŘÄꤡ¤Ć¤Ż¤Ŕ¤ľ¤¤"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "Ě䤤šç¤ď¤ť/¸ĄžÚ¤Ď°ěĹ٤˰ě¤Ä¤ˇ¤ŤźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽéĽ°"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽŠĄźĽŢĽĂĽČ"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽ˝ĄźĽš"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "Ľ¤ĽóĽšĽČĄźĽëĄ˘Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉĄ˘Ľ˝ĄźĽšşď˝üĄ˘ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľëşď˝üťţ¤Î¤ßśŻŔŠ¤Ç¤­"
 "¤Ţ¤š"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "ĽŐĽĄĽ¤Ľë¤ĎĽŃĽĂĽąĄźĽ¸Ľ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßşĆÇŰĂ֤Ǥ­¤Ţ¤š"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
@@ -185,82 +193,78 @@ msgstr ""
 "--relocate ¤Č --excludepath ¤Ďżˇ¤ˇ¤¤ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍŃ"
 "¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix ¤ĎżˇľŹ¤ËĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ¤Ř¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ¤Č --includedocs ¤Ď¤É¤Á¤é¤Ť°ěĘý¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "-ignoreos ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "-ignoresize ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ¤ĎĽŃĽĂĽąĄźĽ¸¤Îşď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -268,13 +272,13 @@ msgid ""
 msgstr ""
 "--nodeps ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎşîŔŽĄ˘Ľ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘¸ĄžÚťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘şîŔŽťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -282,84 +286,88 @@ msgstr ""
 "--root (-r) ¤ĎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘Ě䤤šç¤ď¤ťĄ˘ĽÇĄźĽżĽŮĄźĽšşĆš˝ĂŰťţ¤Î¤ßťŘÄę¤Ç"
 "¤­¤Ţ¤š"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "˝đĚž¤š¤ë¤ż¤á¤ÎĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ËĽ˘ĽŻĽťĽš¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: rpmqv.c:565
-#, fuzzy
+#: rpmqv.c:568
+#, fuzzy, c-format
 msgid "pgp not found: "
 msgstr "pgp ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "ĽŃĽšĽŐĽěĄźĽş¤ňĆţÎϤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "ĽŃĽšĽŐĽěĄźĽşĽÁĽ§ĽĂĽŻ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "ĽŃĽšĽŐĽěĄźĽş¤ĎŔľžď¤Ç¤šĄĽ\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤ĽëĂć¤ÎĚľ¸ú¤Ę %%_signature ĄŁ\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign ¤ĎĽŃĽĂĽąĄźĽ¸şîŔŽťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "źÂšÔźşÇÔ\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "şĆşîŔŽ¤š¤ë¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "şîŔŽ¤Î¤ż¤á¤Î spec ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "şîŔŽ(build)¤Î¤ż¤á¤Î tar ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "¸ĄžÚ¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "°ěťţĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó"
@@ -448,176 +456,176 @@ msgstr "&& ¤Č || ¤ĎʸťúÎóÍѤ˼ľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 msgid "syntax error in expression\n"
 msgstr "ź°Ăć¤Çʸ˥Ľ¨ĽéĄź"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK źşÇÔ: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "%s %s ¤Ç '('¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "')' ¤Ź¤˘¤ę¤Ţ¤ť¤ó %s(%s "
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ěľ¸ú¤Ę %s ¤ÎĽČĄźĽŻĽó: %s"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s %s ¤Ç '('¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
 
-#: build/files.c:561
+#: build/files.c:570
 #, fuzzy, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "%s() ¤ËÂł¤ŻśőÇň¤Ź¤˘¤ę¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:599
+#: build/files.c:608
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "ÉÔŔľ¤Ęʸ˥: %s(%s)"
 
-#: build/files.c:609
+#: build/files.c:618
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "ÉÔŔľ¤ĘĽâĄźĽÉĽšĽÚĽĂĽŻ: %s(%s)"
 
-#: build/files.c:621
+#: build/files.c:630
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "ÉÔŔľ¤ĘĽÇĽŁĽěĽŻĽČĽęĽâĄźĽÉĽšĽÚĽĂĽŻ: %s(%s)"
 
-#: build/files.c:779
+#: build/files.c:788
 #, fuzzy, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "°Űžď¤ĘĽíĽŤĄźĽëÄš: \"%.*s\"  %%lang(%s)"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, fuzzy, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "ĘŁżô¤ÎĽíĽŤĄźĽë %.*s %%lang(%s)"
 
-#: build/files.c:920
+#: build/files.c:929
 #, fuzzy, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "%%docdir ¤Î¸ÂłŚ¤ËĂŁ¤ˇ¤Ţ¤ˇ¤ż"
 
-#: build/files.c:928
+#: build/files.c:937
 #, fuzzy, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "%%docdir ¤Î°úżô¤Ď1¤Ä¤Î¤ß¤Ç¤š"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "1šÔ¤Ë2¤Ä¤ÎĽŐĽĄĽ¤Ľë: %s"
 
-#: build/files.c:981
+#: build/files.c:990
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ď \"/\" ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, fuzzy, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "ž¤ÎĽŐĽŠĄźĽŕ¤ÇĆĂĘĚ¤Ę %%doc ¤ňşŽ¤ź¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ź2˛óÉ˝ľ­¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ď prefix (%s) ¤Č°ěĂפˇ¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤ĎŔčĆŹ¤Ë \"/\" ¤ŹÉŹÍפǤš: %s"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "%d šÔĚÜ: ĽĐĄźĽ¸ĽçĽó¤Ďľö˛Ä¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó(by glob): %s"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "šÔĚÜ: %s"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "ÉÔŔľ¤Ę˝ęÍ­źÔ/Ľ°ĽëĄźĽ×: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ăć\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Î˝čÍýĂć: %s-%s-%s\n"
@@ -671,7 +679,7 @@ msgstr "cpio_copy ¤Ç˝ń¤­šţ¤ßźşÇÔ: %s"
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy ¤ÇĆɤߚţ¤ßźşÇÔ: %s"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn ĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
@@ -681,127 +689,127 @@ msgstr "PreIn ĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn ĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn ĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn ĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript ĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "ĽČĽęĽŹĄźĽšĽŻĽęĽ×ĽČĽŐĽĄĽ¤Ľë¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s ¤ÎĽŞĄźĽ×Ľó: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s ¤ÎĆɤߚţ¤ß: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ¤Ď RPM ĽŃĽĂĽąĄźĽ¸¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ¤Ť¤é¤ÎĽŘĽĂĽŔ¤ÎĆɤߚţ¤ß\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:514
+#: build/pack.c:528
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "ÉÔŔľ¤Ę CSA ĽÇĄźĽż"
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "˝đĚž¤ÎŔ¸ŔŽĂć: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget ¤ÎĆɤߚţ¤ß¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î˝ń¤­šţ¤ß¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "˝ń¤­šţ¤ßĂć: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Î ˝ĐÎĎĽŐĽĄĽ¤ĽëĚž¤ňŔ¸ŔŽ¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s\n"
@@ -846,17 +854,17 @@ msgstr "%%changelog Ăć¤ËŔâĚŔ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d šÔĚÜ: %%description ¤Î˛ňŔĎĽ¨ĽéĄź: %s"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d šÔĚÜ: ÉÔŔľ¤ĘĽŞĽ×ĽˇĽçĽó %s:%s"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "%d šÔĚÜ: ĚžÁ°¤ŹÂż¤š¤Ž¤Ţ¤š: %s"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "%d šÔĚÜ: ĽŃĽĂĽąĄźĽ¸¤ŹÂ¸şß¤ˇ¤Ţ¤ť¤ó: %s"
@@ -876,123 +884,128 @@ msgstr "%d šÔĚÜ: %%files ¤Î˛ňŔĎĽ¨ĽéĄź: %s"
 msgid "line %d: Second %%files list\n"
 msgstr "%d šÔĚÜ: 2ČÖĚܤΠ%%files ĽęĽšĽČ"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, fuzzy, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Ľ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, fuzzy, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Ľ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ď´Ţ¤Ţ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS ¤Ď´Ţ¤Ţ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "%s ĽŐĽŁĄźĽëĽÉ¤ĎĽŃĽĂĽąĄźĽ¸Ăć¤ËÉŹÍפǤš: %s"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĆó˝Ĺ¤Î %s Ľ¨ĽóĽČĽę: %s"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "ÉÔĚŔ¤ĘĽ˘Ľ¤ĽłĽóĽżĽ¤Ľ×: %s"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "%d šÔĚÜ: ÉÔŔľ¤ĘĽŞĽ×ĽˇĽçĽó %s:%s"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "%d šÔĚÜ: ÉÔ´°Á´¤ĘˇÁ¤ÎĽżĽ°: %s"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "%d šÔĚÜ: śő¤ÎĽżĽ°: %s"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "%d šÔĚÜ: %s Ăć¤ËÉÔŔľ¤Ęʸťú '-' : %s"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "%d šÔĚÜ: BuildRoot ¤Ď \"/\" ¤Ë¤š¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "%d šÔĚÜ: Prefixes ¤Ď \"/\" ¤Ç˝Ş¤ď¤Ă¤Ć¤Ď¤¤¤ą¤Ţ¤ť¤ó: %s"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "%d šÔĚÜ: Docdir ¤Ď '/' ¤ÇťĎ¤Ţ¤é¤Ę¤Ż¤Ć¤Ď¤¤¤ą¤Ţ¤ť¤ó: %s"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "%d šÔĚÜ: Epoch/Serial ĽŐĽŁĄźĽëĽÉ¤ĎČÖšć¤Ç¤Ę¤ą¤ě¤Đ¤¤¤ą¤Ţ¤ť¤ó: %s"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "%d šÔĚÜ: ÉÔŔľ¤Ę %s ČÖšć: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "%d šÔĚÜ: ÉÔŔľ¤Ę BuildArchitecture ĽŐĽŠĄźĽŢĽĂĽČ: %s"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "ĆâÉôĽ¨ĽéĄź: ¤Ë¤ť¤ÎĽżĽ° %d"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "ÉÔŔľ¤ĘĽŃĽĂĽąĄźĽ¸¤ÎťŘÄę: %s"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š: %s"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "%d šÔĚÜ: ÉÔĚŔ¤ĘĽżĽ°: %s"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 #, fuzzy
 msgid "Spec file can't use BuildRoot\n"
 msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤Ď BuildRoot ¤ňťČÍѤǤ­¤Ţ¤ť¤ó"
@@ -1074,83 +1087,88 @@ msgid ""
 msgstr ""
 "%d šÔĚÜ: °Í¸Ŕ­ĽČĄźĽŻĽó¤ĎąŃżôťúĄ˘'_'Ą˘'/' ¤ÇťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó: %s"
 
-#: build/parseReqs.c:113
-#, fuzzy, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "%d šÔĚÜ: ĽŐĽĄĽ¤ĽëĚž¤Ďľö˛Ä¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "%d šÔĚÜ: ĽĐĄźĽ¸ĽçĽóÉŐ¤ą¤ľ¤ě¤żĽŐĽĄĽ¤ĽëĚž¤Ďľö˛Ä¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, fuzzy, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "%d šÔĚÜ: ĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš: %s"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, fuzzy, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "%d šÔĚÜ: ĽČĽęĽŹĄź¤Ď -- ¤Ź¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó: %s"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, fuzzy, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "%d šÔĚÜ: %s ¤Îš˝Ę¸˛ňŔĎĽ¨ĽéĄź: %s"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "%d šÔĚÜ: ĽšĽŻĽęĽ×ĽČĽ×ĽíĽ°ĽéĽŕ¤Ď '/' ¤ÇťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó: %s"
+
+#: build/parseScript.c:209
 #, fuzzy, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "%d šÔĚÜ: ĽšĽŻĽęĽ×ĽČĽ×ĽíĽ°ĽéĽŕ¤Ď '/' ¤ÇťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó: %s"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, fuzzy, c-format
 msgid "line %d: Second %s\n"
 msgstr "%d šÔĚÜ: 2ČÖĚܤΠ%s"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "%d šÔĚÜ: %%description ¤Î˛ňŔĎĽ¨ĽéĄź: %s"
+
+#: build/parseSpec.c:201
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "%d šÔĚÜ: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "ĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, fuzzy, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if ¤ŹĘĤ¸¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, fuzzy, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s%d: parseExpressionBoolean ¤Ź %d ¤ňĘÖ¤ˇ¤Ţ¤ˇ¤ż"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: if ¤Ź¤Ę¤¤¤Î¤Ë %%else ¤Ź¤˘¤ę¤Ţ¤š"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: if ¤Ź¤Ę¤¤¤Î¤Ë %%endif ¤Ź¤˘¤ę¤Ţ¤š"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, fuzzy, c-format
 msgid "malformed %%include statement\n"
 msgstr "¤Ş¤Ť¤ˇ¤Ę %%include ĽšĽĆĄźĽČĽáĽóĽČ¤Ç¤š"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "şîŔŽ(build)˛ÄÇ˝¤ĘĽ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ď¤˘¤ę¤Ţ¤ť¤ó"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë¤Ď %%description ¤Ź¤˘¤ę¤Ţ¤ť¤ó: %s"
@@ -1289,20 +1307,20 @@ msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎÂОݼ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
@@ -1410,83 +1428,94 @@ msgstr ""
 msgid " failed - "
 msgstr "źşÇÔ - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %s ¤Ď rpmrc ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %s ¤Ď rpmrc ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %s ¤Ď db ¤ŹÄ󜥤š¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
 
@@ -1499,7 +1528,7 @@ msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
@@ -1508,7 +1537,7 @@ msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "PGP ˝đĚž¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
@@ -1528,7 +1557,7 @@ msgstr "mntctl() fugger ĽľĽ¤Ľş¤ňĘÖ¤š¤Î¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s"
 msgid "failed to stat %s: %s\n"
 msgstr "stat %s ¤ËźşÇÔ: %s"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s"
@@ -1602,270 +1631,312 @@ msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
 msgid "%s created as %s\n"
 msgstr "ˇŮšđ: %s ¤Ď %s ¤Č¤ˇ¤ĆşîŔŽ¤ľ¤ě¤Ţ¤š"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
+
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%s ¤ňşîŔŽ¤Ç¤­¤Ţ¤ť¤ó: %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%s ¤Ř˝ń¤­šţ¤á¤Ţ¤ť¤ó"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, fuzzy, c-format
 msgid "error creating temporary file %s\n"
 msgstr "°ěťţĽŐĽĄĽ¤Ľë %s ¤ÎşîŔŽĽ¨ĽéĄź"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "ĽáĽ¸ĽăĄźČÖšć <=3 ¤ÎĽŃĽĂĽąĄźĽ¸¤Î¤ß¤ł¤ÎĽĐĄźĽ¸ĽçĽó¤Î RPM ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤š"
 
-#: lib/package.c:786
+#: lib/package.c:794
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "ĽáĽ¸ĽăĄźČÖšć <=3 ¤ÎĽŃĽĂĽąĄźĽ¸¤Î¤ß¤ł¤ÎĽĐĄźĽ¸ĽçĽó¤Î RPM ¤ĎĽľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤š"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Í­¸ú¤Ę˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "ɸ˝ŕ˝ĐÎϤň <cmd> ¤ŘĽŃĽ¤Ľ×¤ˇ¤Ţ¤š"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "ĽČĽĂĽ×ĽÇĽŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňťČÍѤˇ¤Ţ¤š"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "°úżô˝čÍý(%d)¤Ç¤ÎĆâÉôĽ¨ĽéĄź :-(\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "˝üł°¤š¤ëĽŃĽš¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "şĆÇŰĂÖ¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "şĆÇŰĂÖ¤Ď = ¤ň´Ţ¤ó¤Ç¤¤¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "şĆÇŰĂÖ¤Ď = ¤ÎźĄ¤Ë / ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "Ľ°ĽëĄźĽ×Ăć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š\n"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "ŔßÄę¤ňĽšĽ­ĽĂĽ×¤ˇĄ˘Á´ĽŐĽĄĽ¤Ľë¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1873,168 +1944,177 @@ msgstr ""
 "<package> ¤Č°ěĂפš¤ëĽŃĽĂĽąĄźĽ¸Á´¤Ć¤ňşď˝ü¤ˇ¤Ţ¤š(°ěČĚ\n"
 "\t\t\t      ĹŞ¤ËĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤚ¤ë¤ČĽ¨ĽéĄź¤Ë¤Ę¤ę¤Ţ¤š)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸ťŘÄę¤ÎĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "ĽŃĽš %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó(ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ËÂФˇ¤Ć)"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ňşď˝ü(Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë)¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 #, fuzzy
 msgid "<package>+"
 msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "Á´¤Ć¤ÎŔßÄęĽŐĽĄĽ¤Ľë¤ňÎóľó¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "ĽÉĽ­ĽĺĽáĽóĽČ¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "ĽŃĽš <path> Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "ĽŃĽš %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó(ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ËÂФˇ¤Ć)"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs ¤Č --replacefiles ¤ňĂť˝Ě¤ˇ¤ż¤â¤Î"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëşÝ¤Ë '#' ¤ÇÉ˝ź¨¤ˇ¤Ţ¤š(-v ¤ňťČÍѤš¤ë¤ČÎɤ¤)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎÂОݼ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "ĽŃĽĂĽąĄźĽ¸ÂĐžÝOS¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëÁ°¤ËĽÇĽŁĽšĽŻ¤ÎÍĆÎĚĽÁĽ§ĽĂĽŻ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "ĽÉĽ­ĽĺĽáĽóĽČ¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 "ĽÇĄźĽżĽŮĄźĽš¤ňššżˇ¤ˇ¤Ţ¤š¤ŹĄ˘\n"
 "ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕ¤ÎĘŃšš¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "Á´¤Ć¤ÎŔßÄęĽŐĽĄĽ¤Ľë¤ňÎóľó¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "°Í¸Ŕ­¤ňËţ¤ż¤š¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Î\n"
 "Ľ¤ĽóĽšĽČĄźĽë¤ňÍ׾ᤡ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 "¤ł¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆĽČĽęĽŹĄź¤ľ¤ě¤ëĽšĽŻĽęĽ×ĽČ¤ň\n"
 "źÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸ťŘÄę¤ÎĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2042,511 +2122,525 @@ msgstr ""
 "¸Ĺ¤¤ĽĐĄźĽ¸ĽçĽó¤ÎĽŃĽĂĽąĄźĽ¸¤ËĽ˘ĽĂĽ×Ľ°ĽěĄźĽÉ¤ˇ¤Ţ¤š\n"
 "(Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉťţ¤Î --force ¤Ď¤ł¤ě¤ňźŤĆ°Ĺޤ˚Ԥ¤¤Ţ¤š)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëşÝ¤Ë '%' ¤ÇÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "şĆÇŰĂÖ˛ÄÇ˝¤ĘĽŃĽĂĽąĄźĽ¸¤ËÂФˇĄ˘Ľ¤ĽóĽšĽČĄźĽëĽŃĽš\n"
 "ŔÜĆŹź­¤ň <dir> ¤ËŔßÄꤡ¤Ţ¤š"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "<oldpath> ¤Ť¤é <newpath> ¤ËĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ľ¤ť¤Ţ¤š"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "<oldpath> ¤Ť¤é <newpath> ¤ËĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ľ¤ť¤Ţ¤š"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
 msgstr ""
-"Ľ¤ĽóĽšĽČĄźĽëťţ¤ËĂÖ¤­´š¤¨¤é¤ě¤ëĽŐĽĄĽ¤Ľë¤Ź\n"
-"¤˘¤Ă¤Ć¤âĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "´ű¤Ë¸şß¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ç¤âşĆĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤ť¤ş¤ËĄ˘ĽĆĽšĽČ¤Î¤ßšÔ¤¤¤Ţ¤š"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "Á´¤Ć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "Ě䤤šç¤ď¤ťĽâĄźĽÉ"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 #, fuzzy
 msgid "query/verify package(s) owning file"
 msgstr "<file> ¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "ĽŐĽĄĽ¤Ľë¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
+msgid "query/verify package(s) in group"
+msgstr "Ľ°ĽëĄźĽ×Ăć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š\n"
 
-#: lib/poptQV.c:103
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) in group"
+msgid "query/verify a package file"
+msgstr "Á´¤Ć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
+
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "Ľ°ĽëĄźĽ×Ăć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š\n"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "Ľ°ĽëĄźĽ×Ăć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š\n"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "ĽŐĽĄĽ¤Ľë¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "Á´¤Ć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
+msgid "query/verify package(s) with header identifier"
+msgstr "ĽŐĽĄĽ¤Ľë¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "ĽŐĽĄĽ¤Ľë¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 #, fuzzy
 msgid "rpm query mode"
 msgstr "Ě䤤šç¤ď¤ťĽâĄźĽÉ"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "ĽŐĽĄĽ¤Ľë¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 #, fuzzy
 msgid "query a spec file"
 msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "Ľ°ĽëĄźĽ×Ăć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š\n"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 #, fuzzy
 msgid "query the package(s) triggered by the package"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆĽČĽęĽŹĄź¤ľ¤ě¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "Ě䤤šç¤ď¤ťĽâĄźĽÉ"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 #, fuzzy
 msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 "<cap> ¤ÎľĄÇ˝¤ňÉŹÍפȤš¤ëĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤Ć\n"
 "Ě䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 #, fuzzy
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "<cap> ¤ňÄ󜥤š¤ëĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
+
+#: lib/poptQV.c:257
 #, fuzzy
 msgid "list all configuration files"
 msgstr "Á´¤Ć¤ÎŔßÄęĽŐĽĄĽ¤Ľë¤ňÎóľó¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 #, fuzzy
 msgid "list all documentation files"
 msgstr "Á´¤Ć¤ÎĽÉĽ­ĽĺĽáĽóĽČĽŐĽĄĽ¤Ľë¤ňÎóľó¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 #, fuzzy
 msgid "dump basic file information"
 msgstr "´đËÜĹŞ¤ĘĽŐĽĄĽ¤ĽëžđĘó¤ňĽŔĽóĽ×¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 #, fuzzy
 msgid "list files in package"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňÎóľó¤ˇ¤Ţ¤š\n"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "°Ę˛ź¤ÎĚ䤤šç¤ď¤ťĽŐĽŠĄźĽŢĽĂĽČ¤ňťČÍѤˇ¤Ţ¤š"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "°Ę˛ź¤ÎĽŤĽżĽíĽ°¤Ť¤é i18n ĽťĽŻĽˇĽçĽó¤ňĂÖ¤­´š¤¨¤Ţ¤š"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "Îóľó¤ˇ¤żĽŐĽĄĽ¤Ľë¤ÎžőÂÖ¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ˇ¤Ţ¤š(¸˝şß¤Î˝đĚž¤ĎźÎ¤Ć¤é¤ě¤Ţ¤š)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ˇ¤Ţ¤š(¸˝şß¤Î˝đĚž¤ĎźÎ¤Ć¤é¤ě¤Ţ¤š)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 #, fuzzy
 msgid "generate signature"
 msgstr "PGP/GPG ˝đĚž¤ňŔ¸ŔŽ¤ˇ¤Ţ¤š"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ź´üÂÔ¤ľ¤ě¤Ţ¤šĄ˘ĽĐĽ¤ĽĘĽę¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Ľ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤Ď .spec ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸: %s-%s-%s ĽŐĽĄĽ¤ĽëĽĆĽšĽČ = %d\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Ľ˘Ľ¤ĽłĽó¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ÎĽ˘ĄźĽŤĽ¤ĽÖ¤Îż­Äš¤ËźşÇÔ %s%s: %s"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 #, fuzzy
 msgid " on file "
 msgstr "ĽŐĽĄĽ¤Ľëžĺ"
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s źşÇÔ"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "ĽŐĽŠĄźĽŢĽĂĽČĂć¤ÎĽ¨ĽéĄź: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "ĽŐĽĄĽ¤Ľë¤ň´Ţ¤ó¤Ç¤¤¤Ţ¤ť¤ó"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "ÄĚžď"
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "ĂÖ¤­´š¤¨¤é¤ě¤Ć¤¤¤Ţ¤š"
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "ĽÍĽĂĽČśŚÍ­"
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(˛ż¤ÎžőÂ֤⤢¤ę¤Ţ¤ť¤ó)"
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(̤ĂΤΠ%3d)"
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ĎĽŐĽĄĽ¤Ľë˝ęÍ­źÔ¤ä id ĽęĽšĽČ¤ň¤É¤Á¤é¤âťý¤Ă¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: lib/query.c:299
+#: lib/query.c:304
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ĎĽŐĽĄĽ¤Ľë˝ęÍ­źÔ¤ä id ĽęĽšĽČ¤ň¤É¤Á¤é¤âťý¤Ă¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "%s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
-
-#: lib/query.c:517
-#, fuzzy
-msgid "no packages\n"
-msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "ÉÔĚŔ¤ĘĽżĽ°"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Ľ°ĽëĄźĽ× %s ¤Ë°¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s ¤ňĆɤŕ¤Î¤ËźşÇÔ: $sĄŁ"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s ¤ňÉŹÍפȤš¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s ¤ňÄ󜥤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ď¤É¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤â°¤ˇ¤Ć¤¤¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "Ěľ¸ú¤ĘĽŃĽĂĽąĄźĽ¸ČÖšć: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "ÉÔŔľ¤ĘĽŐĽĄĽ¤Ľë¤ÎžőÂÖ: %s"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %s ¤Ď provide ¤Ë˛Ă¤¨¤ë¤ł¤Č¤Ë¤č¤Ă¤ĆËţ¤ľ¤ě¤Ţ¤šĄŁ\n"
@@ -2646,15 +2740,15 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2663,13 +2757,13 @@ msgstr ""
 "\"B\" ¤Î°Í¸Ŕ­¤Ď epoch ¤ňÉŹÍפȤˇ¤Ţ¤š(\"A\"¤ČĆą¤¸¤Ç¤˘¤ë¤Č˛žÄꤡ¤Ć)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
@@ -2679,158 +2773,187 @@ msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ď missingok ĽŐĽéĽ°¤Î¤ż¤áĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "ÉÔĚŔ¤ĘĽżĽ°"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "°Í¸Ŕ­¤ÎˇçÇĄ:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 #, fuzzy
 msgid "Repackaging erased files..."
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ËĽŐĽĄĽ¤Ľë¤ŹÍ­¤ę¤Ţ¤ť¤ó\n"
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "%s ¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤š: (%s ¤ňťČÍѤˇ¤Ć¤¤¤Ţ¤š)...\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr "%s ¤Č¤ˇ¤Ć...\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "¸Ĺ¤¤ĽšĽżĽ¤Ľë¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ť¤é¤ÎĆɤߚţ¤ßĽ¨ĽéĄź "
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ë¤Ď¤č¤ężˇ¤ˇ¤¤ RPM ¤ÎĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "°Í¸Ŕ­¤ÎˇçÇĄ:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "ĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¤ĎĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤡ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "%s ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
 #: lib/rpmlead.c:56
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
@@ -2845,7 +2968,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2872,6 +2995,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- ¤ĎʸťúÎóÍѤ˼ľĽÝĄźĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2956,175 +3084,230 @@ msgstr " %s-%s-%s ¤ČśĽšç¤ˇ¤Ţ¤š\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ÉÔĚŔ¤ĘĽ¨ĽéĄź %d ¤ŹĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ÎÁŕşîĂć¤Ë¤Ş¤­¤Ţ¤ˇ¤ż"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "2ČÖĚܤΠ':' ¤Ź¤˘¤ę¤Ţ¤ť¤ó(%s:%d ¤Ç)"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%s:%d ¤ËĽ˘ĄźĽ­ĽĆĽŻĽÁĽăĚž¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%s:%d ¤ÇĽÇĄźĽżšÔ¤ŹÉÔ´°Á´¤Ç¤š"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%s:%d ¤ÇĽÇĄźĽżšÔ¤Ë°úżô¤ŹÂż¤š¤Ž¤Ţ¤š"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "ÉÔŔľ¤Ę arch/os ČÖšć: %s (%s:%d)"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%s:%d ¤ÇÉÔ´°Á´¤ĘĽÇĽŐĽŠĽëĽČšÔ"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%s:%d ¤ÇĽÇĽŐĽŠĽëĽČšÔ¤Ď°úżô¤ŹÂż¤š¤Ž¤Ţ¤š"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s ¤ňĆɤŕ¤Î¤ËźşÇÔ: $sĄŁ"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "%s:%d ¤Ç ':' ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s ¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó %s:%d"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s ¤Îż­ÄĽźşÇÔ %s:%d \"%s\""
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó  %s:%d"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%s ÍѤμ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó %s:%d"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "'%s' ¤ÎÉÔŔľ¤ĘĽŞĄźĽ×Ľó %s:%d"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "ÉÔĚŔ¤ĘĽˇĽšĽĆĽŕ: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "rpm-list@redhat.com ¤ËϢÍí¤ň˛ź¤ľ¤¤\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "ż­ÄĽ¤Ç¤­¤Ţ¤ť¤ó %s"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Ćɤߚţ¤ŕ¤ż¤á¤Ë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %sĄŁ"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "Ěľ¸ú¤ĘĽŃĽĂĽąĄźĽ¸ČÖšć: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "%s %s ¤Ç '('¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "Ěľ¸ú¤ĘĽŃĽĂĽąĄźĽ¸ČÖšć: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "šÔĚÜ: %s"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Ľ˝ĄźĽš¤Ď: %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "ĽŢĽŚĽóĽČ¤ľ¤ě¤żĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕ¤ÎĽęĽšĽČ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3141,6 +3324,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3165,6 +3349,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3237,6 +3422,9 @@ msgstr "GPG ˝đĚž¤Î %d ĽĐĽ¤ĽČ¤ňźčĆŔ\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3261,44 +3449,167 @@ msgstr "ĽŘĽĂĽŔĽľĽ¤Ľş¤ŹÂ礭¤š¤Ž¤Ţ¤š"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "MD5 ˝đĚž¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "˝đĚžĽŃĽĂĽÉ: %d\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "ĽŃĽĂĽąĄźĽ¸¤ËĽ°ĽëĄźĽ×¤Ź¤˘¤ę¤Ţ¤ť¤ó\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "%s ¤ňĽČĽęĽŹĄź¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ď¸şß¤ˇ¤Ţ¤ť¤ó\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "ĽŃĽĂĽąĄźĽ¸¤Ť¤éĽŘĽĂĽŔ¤ÎĆɤߚţ¤ß¤ÎĽ¨ĽéĄź\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3307,11 +3618,16 @@ msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+#, fuzzy
+msgid "running pre-transaction scripts\n"
+msgstr "Ľ×ĽęĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3320,7 +3636,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3328,13 +3644,38 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+#, fuzzy
+msgid "running post-transaction scripts\n"
+msgstr "ĽÝĽšĽČĽ˘ĽóĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "%s ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó\n"
 
 #: lib/verify.c:437
@@ -3367,135 +3708,135 @@ msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "ĽÇĄźĽżĽŮĄźĽšĽâĄźĽÉ 0x%x ¤ÎĽŞĄźĽ×Ľó (%s)\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ĽÇĄźĽżĽŮĄźĽš¤Î %s ¤ňĽíĽĂĽŻ¤Ç¤­¤Ţ¤ť¤ó"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "˝üł°"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "śŚÍ­"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "%s ÍѤΠfile Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "% ¤Î¸ĺ¤Ë { ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "%{ ¤Î¸ĺ¤Ë } ¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "śő¤ÎĽżĽ°ĽŐĽŠĄźĽŢĽĂĽČ"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "śő¤ÎĽżĽ°Ěž"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "ÉÔĚŔ¤ĘĽżĽ°"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "ÇŰÎó¤Î¸ĺ¤Ë ] ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "Í˝´ü¤ť¤Ě ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "Í˝´ü¤ť¤Ě }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "ź°Ăć¤Ç ? ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "ź°Ăć¤Ç ? ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "ź°Ăć¤Ë } ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "°Ę˛ź¤Î ? ĽľĽÖź°¤Î ¤Ë: ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "ź°Ăć¤Ç : ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "ź°¤Î˝Ş¤ę¤Ë | ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3522,337 +3863,337 @@ msgstr "ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľë¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó  %s:%d"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "¸Ąş÷¤Î¤ż¤á¤Î %d ¤Ç ĽŘĽĂĽŔ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "name Ľ¤ĽóĽÇĽĂĽŻĽšşď˝ü¤ˇ¤Ţ¤š\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "ĽěĽłĄźĽÉ %s ¤ÎźčĆŔ¤ÎĽ¨ĽéĄź (%s ¤Ť¤é)"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤Ëşď˝ü¤ÇĽ¨ĽéĄź"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ÎĂľş÷Ľ¨ĽéĄź\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%s ¤ň %s ¤ŘĚžÁ°¤ňĘŃšš¤ˇ¤Ţ¤š\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "ĽěĽłĄźĽÉ %s ¤ň %s ¤ËĽšĽČĽ˘¤ÇĽ¨ĽéĄź "
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "dbpath ¤ŹŔßÄꤾ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ăć¤ÇĽÇĄźĽżĽŮĄźĽš¤ňşĆš˝Ăۤˇ¤Ţ¤š\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "°ěťţĹŞ¤ĘĽÇĄźĽżĽŮĄźĽš %s ¤Ď¤š¤Ç¤Ë¸şß¤ˇ¤Ć¤¤¤Ţ¤š"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "żˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ÎĽŞĄźĽ×Ľó\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "ĽÇĄźĽżĽŮĄźĽšĂć¤ÎĽěĽłĄźĽÉČÖšć %d ¤ĎÉÔŔľ¤Ç¤š -- ĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%d ¤Ë ĽŞĽęĽ¸ĽĘĽë¤ÎĽěĽłĄźĽÉ¤ňÉղäǤ­¤Ţ¤ť¤ó"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ĽÇĄźĽżĽŮĄźĽš¤ÎşĆš˝Ăۤ˟şÇÔ; ĽŞĽęĽ¸ĽĘĽëĽÇĄźĽżĽŮĄźĽš¤Ź¤Ţ¤Ŕ¤˝¤ł¤ËťÄ¤Ă¤Ć¤¤¤Ţ¤š\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Ĺ¤¤ĽÇĄźĽżĽŮĄźĽš¤ňżˇ¤ˇ¤¤ĽÇĄźĽżĽŮĄźĽš¤ËĂÖ¤­´š¤¨¤ë¤Î¤ËźşÇÔ!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽęĽŤĽĐĄź¤š¤ë¤ż¤á¤Ë %s ¤Ť¤éĽŐĽĄĽ¤Ľë¤ČĂÖ¤­´š¤¨¤Ţ¤š"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤Îşď˝üźşÇÔ: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== Ľ˘ĽŻĽĆĽŁĽÖ %d Ľ¨ĽóĽ×ĽĆĽŁ %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "ĽŢĽŻĽí %%%s ¤ĎĽÜĽÇĽŁ¤Ź˝ŞĂź¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "ĽŢĽŻĽí %%%s ¤Ď°ăËĄ¤ĘĚžÁ°¤Ç¤š(%%define)"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "ĽŢĽŻĽí %%%s ¤Ď opts ¤Ź˝ŞĂź¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "ĽŢĽŻĽí %%%s ¤Ďśő¤ÎĽÜĽÇĽŁ¤Ç¤š"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "ĽŢĽŻĽí %%%s ¤Ďż­Äš¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "ĽŢĽŻĽí %%%s ¤Ď°ăËĄ¤ĘĚžÁ°¤Ç¤š(%%undefine)"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "ĽŢĽŻĽí %%%s (%s) ¤ĎĽěĽŮĽë %d °Ę˛ź¤ÇťČÍѤľ¤ě¤Ţ¤ť¤ó¤Ç¤ˇ¤ż"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "ÉÔĚŔ¤ĘĽŞĽ×ĽˇĽçĽó %c (%s(%s)Ăć¤Ë)"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "şĆľ˘¤Îżź¤ľ(%d)¤ŹşÇÂçĂÍ(%d)¤č¤ę¤âÂ礭¤¤"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "˝ŞĂź¤ľ¤ě¤Ć¤¤¤Ę¤¤ %c: %s"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, fuzzy, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "A %% ¤Ďš˝Ę¸˛ňŔϤǤ­¤Ę¤¤ĽŢĽŻĽí¤ŹÂł¤¤¤Ć¤¤¤Ţ¤š"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "ĽŢĽŻĽí %%%.*s ¤Ď¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤óĄ˘ĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "ĽżĄźĽ˛ĽĂĽČĽĐĽĂĽŐĽĄĽŞĄźĽĐĄźĽŐĽíĄź"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: %s"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, fuzzy, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: ¤Ď %d ĽĐĽ¤ĽČ¤č¤ęžŽ¤ľ¤¤¤Ç¤š"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "ŔŽ¸ů"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 #, fuzzy
 msgid "Bad server response"
 msgstr "ĽľĄźĽĐ¤Ť¤éŔľžď¤ĘąţĹú¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 #, fuzzy
 msgid "Server I/O error"
 msgstr "ĽľĄźĽĐ IO Ľ¨ĽéĄź"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 #, fuzzy
 msgid "Server timeout"
 msgstr "ĽľĄźĽĐĽżĽ¤ĽŕĽ˘ĽŚĽČ"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "ĽľĄźĽĐ¤ÎĽŰĽšĽČĽ˘ĽÉĽěĽš¤ňÄ´¤Ů¤é¤ě¤Ţ¤ť¤ó"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "ĽľĄźĽĐ¤ÎĽŰĽšĽČĚž¤ňÄ´¤Ů¤é¤ě¤Ţ¤ť¤ó"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "ĽľĄźĽĐ¤Ř¤ÎŔÜÂł¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "ĽľĄźĽĐ¤Č¤ÎĽÇĄźĽżĽłĽÍĽŻĽˇĽçĽó¤ÎłÎΊ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "ĽíĄźĽŤĽëĽŐĽĄĽ¤Ľë¤Î IO Ľ¨ĽéĄź"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "ĽęĽâĄźĽČĽľĄźĽĐ¤ÎĽŃĽĂĽˇĽÖĽâĄźĽÉŔßÄ꼨ĽéĄź"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "ĽľĄźĽĐžĺ¤ËĽŐĽĄĽ¤Ľë¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "˝čÍýĂć¤ÎĽ˘ĽÜĄźĽČ"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "ÉÔĚŔ¤â¤ˇ¤Ż¤ĎÍ˝´ü¤ť¤ĚĽ¨ĽéĄź"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "%s ¤Ř %s pw %s ¤Č¤ˇ¤ĆĽíĽ°Ľ¤ĽóĂć\n"
@@ -3863,6 +4204,7 @@ msgid "(no error)"
 msgstr "(Ľ¨ĽéĄź 0x%x)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "Ă×̿Ū¤ĘĽ¨ĽéĄź: "
@@ -3882,94 +4224,62 @@ msgstr "ˇŮšđ: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s ¤ÎĽŃĽšĽďĄźĽÉ:"
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "Ľ¨ĽéĄź: %sĽÝĄźĽČ¤Ďżôťú¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "url ĽÝĄźĽČ¤Ďżôťú¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
+#: tools/rpmcache.c:519
 #, fuzzy
-msgid "don't change directories"
-msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr ""
+msgid "File tree walk options:"
+msgstr "˝đĚžĽľĽ¤Ľş: %d\n"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: fdOpen ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
@@ -4066,6 +4376,28 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
+
+#, fuzzy
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "%d šÔĚÜ: ĽŐĽĄĽ¤ĽëĚž¤Ďľö˛Ä¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr ""
+#~ "Ľ¤ĽóĽšĽČĄźĽëťţ¤ËĂÖ¤­´š¤¨¤é¤ě¤ëĽŐĽĄĽ¤Ľë¤Ź\n"
+#~ "¤˘¤Ă¤Ć¤âĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "%s ¤Ř¤ÎĚ䤤šç¤ď¤ť¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó\n"
+
+#, fuzzy
+#~ msgid "no packages\n"
+#~ msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
+
 #, fuzzy
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
@@ -4116,10 +4448,6 @@ msgstr ""
 #~ msgstr "¸Ĺ¤¤(ĆâÉô¤Ŕ¤ą¤Î)˝đĚž!  ¤É¤Ś¤ä¤Ă¤Ć¤˝¤ě¤ňźę¤Ë¤¤¤ě¤Ţ¤ˇ¤ż¤Ť!?"
 
 #, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "ĽÝĽšĽČĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr "ĽšĽŻĽęĽ×ĽČ¤ÎźÂšÔ¤ËźşÇÔ"
@@ -4765,9 +5093,6 @@ msgstr ""
 #~ msgid "stopping install as we're running --test\n"
 #~ msgstr "--test ¤ňźÂšÔ¤š¤ë¤č¤Ś¤ËĽ¤ĽóĽšĽČĄźĽë¤ňĂćťß¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#~ msgid "running preinstall script (if any)\n"
-#~ msgstr "Ľ×ĽęĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
-
 #, fuzzy
 #~ msgid "removal of %s failed: %s\n"
 #~ msgstr "%s ¤Îşď˝ü¤ËźşÇÔ: %s"
@@ -4775,9 +5100,6 @@ msgstr ""
 #~ msgid "will remove files test = %d\n"
 #~ msgstr "ĽŐĽĄĽ¤Ľë test = %d ¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
-#~ msgid "running postuninstall script (if any)\n"
-#~ msgstr "ĽÝĽšĽČĽ˘ĽóĽ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ(¤ŹÍ­¤ě¤Đ)¤ňźÂšÔ¤ˇ¤Ţ¤š\n"
-
 #, fuzzy
 #~ msgid ""
 #~ "retrieval of return code of %s scriptlet from %s-%s-%s failed, waitpid "
@@ -5075,9 +5397,6 @@ msgstr ""
 #~ msgid "package %s not listed in %s"
 #~ msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď %s Ăć¤ËĽęĽšĽČ¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó"
 
-#~ msgid "package has no group\n"
-#~ msgstr "ĽŃĽĂĽąĄźĽ¸¤ËĽ°ĽëĄźĽ×¤Ź¤˘¤ę¤Ţ¤ť¤ó\n"
-
 #~ msgid "removing provides index for %s\n"
 #~ msgstr "%s ÍѤΠprovides Ľ¤ĽóĽÇĽĂĽŻĽš¤ňşď˝ü¤ˇ¤Ţ¤š\n"
 
diff --git a/po/ko.po b/po/ko.po
index d7f04bff1..78dcfbf0a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -63,10 +63,12 @@ msgid "Building for target %s\n"
 msgstr "%s(Ŕť)¸Ś ÁŚŔŰÇĎ°í ŔÖ˝Ŕ´Ď´Ů\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "ŔÎźö °ŞŔ¸ˇÎ RPM ĆĐĹ°Áö°Ą ÁöÁ¤ľÇžîžß ÇŐ´Ď´Ů\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "ĆĐĹ°ÁöŔÇ Çě´ő¸Ś ŔĐ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
@@ -83,166 +85,172 @@ msgstr "ÁúŔÇ żÉźÇ (-q śÇ´Â --query żÉźÇ°ú ÇÔ˛˛ ťçżë):"
 msgid "Verify options (with -V or --verify):"
 msgstr "°ËÁő żÉźÇ (-V śÇ´Â --verify żÉźÇ°ú ÇÔ˛˛ ťçżë):"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "°ËÁő żÉźÇ (-V śÇ´Â --verify żÉźÇ°ú ÇÔ˛˛ ťçżë):"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "ź­¸í żÉźÇ:"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "ľĽŔĚĹÍşŁŔĚ˝ş żÉźÇ:"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "´ŮŔ˝°ú ÇÔ˛˛ ťçżëÇĎ´Â ÁŚŔŰ żÉźÇ [ <specĆÄŔĎ> | <tarĆÄŔĎ> | <źŇ˝ş ĆĐĹ°Áö> ]:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr "źłÄĄ/ž÷ą×ˇšŔĚľĺ/ťčÁŚ żÉźÇ:"
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
 msgstr "¸đľç rpm ¸đľĺżĄź­ŔÇ ŔĎšÝŔűŔÎ żÉźÇ:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM šöŔü - %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "ŔĚ ÇÁˇÎą×ˇĽŔş GNU Public License łťżĄź­ ŔÚŔŻˇÓ°Ô ŔçščĆ÷ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "ŔÎźö Ăł¸Ž°úÁ¤ (%d) ľľÁß łťşÎ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "ÇĎłŞŔÇ ÁÖ(major) ¸đľĺ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "ÁúŔÇ/°ËÁő ŔŻÇüŔş °˘°˘ ´Ů¸Ľ ŔŻÇü°ú ľż˝ĂżĄ źöÇŕÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "şÎŔűŔýÇŃ ÁúŔÇ ÇáĄą× ŔÔ´Ď´Ů"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "şÎŔűŔýÇŃ ÁúŔÇ Çü˝Ä ŔÔ´Ď´Ů"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "şÎŔűŔýÇŃ ÁúŔÇ źŇ˝ş ŔÔ´Ď´Ů"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "źłÄĄ, ž÷ą×ˇšŔĚľĺ, źŇ˝ş ťčÁŚ, spec ĆÄŔĎ ťčÁŚ˝ĂżĄ¸¸ źöÇŕľË´Ď´Ů"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ĆÄŔĎŔť ŔçščÄĄÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate żÍ --excludepath żÉźÇŔş ĂÖ˝ĹŔÇ ĆĐĹ°Áö¸Ś źłÄĄÇŇ ś§żĄ¸¸ ťçżëÇŇ źö ŔÖ"
 "˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix żÉźÇŔş ĂÖ˝ĹŔÇ ĆĐĹ°Áö¸Ś źłÄĄÇŇ ś§żĄ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix żÉźÇŔÇ ŔÎźö´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs żÍ --includedocs żÉźÇ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches żÉźÇŔş ĆĐĹ°Áö ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "˝şĹŠ¸łĆŽ ÇŘÁŚ żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "ĆŽ¸Ž°Ĺ ÇŘÁŚ żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -250,13 +258,13 @@ msgstr ""
 "--nodeps żÉźÇŔş ĆĐĹ°Áö ÁŚŔŰ, ŔçÁŚŔŰ(rebuild), ŔçÄÄĆÄŔĎ(recompile), źłÄĄ, ťč"
 "ÁŚ, °ËÁő˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test żÉźÇŔş ĆĐĹ°Áö źłÄĄ, ťčÁŚ, ÁŚŔ۽ÿĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -264,82 +272,87 @@ msgstr ""
 "--root (-r) żÉźÇŔş ĆĐĹ°Áö źłÄĄ, ťčÁŚ, ÁúŔÇ, ľĽŔĚĹÍşŁŔĚ˝ş Ŕ繸Ăŕ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ "
 "źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) żÉźÇŔÇ ŔÎźö´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "ź­¸íÇŇ ĆÄŔĎŔĚ žř˝Ŕ´Ď´Ů\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "%s ĆÄŔĎżĄ Á˘ąŮÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp¸Ś ĂŁŔť źö žřŔ˝: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "ĆĐ˝ş ą¸šŽ(pass phrase) ŔÔˇÂ: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "ĆĐ˝ş ą¸šŽ(pass phrase)ŔĚ żĂšŮ¸ŁÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "ĆĐ˝ş ą¸šŽ(pass phrase)ŔĚ ŔĎÄĄÇŐ´Ď´Ů.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "¸ĹĹŠˇÎ ĆÄŔĎżĄ şÎŔűÇŐÇŃ %%_signatureŔÇ łťżëŔĚ ŔÖ˝Ŕ´Ď´Ů.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign żÉźÇŔş ĆĐĹ°Áö ÁŚŔ۽ÿĄ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "ŔçÁŚŔŰ(rebuild)ÇŇ ĆĐĹ°Áö ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ spec ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ tar ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr "ťčÁŚÇŇ ĆĐĹ°Áö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "źłÄĄÇŇ ĆĐĹ°Áö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "°ËÁőżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Ŕӽà ĆÄŔĎŔť ż­ źö žř˝Ŕ´Ď´Ů.\n"
 
@@ -418,176 +431,176 @@ msgstr "'&&' żÍ '||' ´Â šŽŔÚż­żĄź­ ťçżëÇŇ źö žř˝Ŕ´Ď´Ů\n"
 msgid "syntax error in expression\n"
 msgstr "ÇĽÇö˝ÄżĄź­ ą¸šŽ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK ˝ÇĆĐ: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "%s %sżĄ '(' °Ą žř˝Ŕ´Ď´Ů\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "%s(%sżĄ ')' °Ą žř˝Ŕ´Ď´Ů\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "şÎŔűÇŐÇŃ %s ĹäĹŤ: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%2$s %3$sżĄ %1$s °Ą žř˝Ŕ´Ď´Ů\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "%s() ´ŮŔ˝żĄ °řšéŔĚ žřŔ˝: %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Ŕ߸řľČ ą¸šŽ: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Ŕ߸řľČ ¸đľĺ spec: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Ŕ߸řľČ dir¸đľĺ spec: %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, fuzzy, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "şńÁ¤ťóŔűŔÎ ˇÎÄÉŔĎ ąćŔĚ: %%lang(%2$s)żĄ \"%1$.*s\"\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, fuzzy, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "%%lang(%2$s)żĄ ÁßşšľČ ˇÎÄÉŔĎ %1$.*s°Ą Á¸ŔçÇŐ´Ď´Ů\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "%%docdirŔÇ ÇŃ°č°Ą ĂĘ°úľÇžú˝Ŕ´Ď´Ů\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "%%docdirżĄ ÇĎłŞŔÇ ŔÎźö¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "ÇĎłŞŔÇ Ç࿥ ľÎ°łŔÇ ĆÄŔĎŔĚ Á¸ŔçÇÔ: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "ĆÄŔĎŔş šÝľĺ˝Ă \"/\" ˇÎ ˝ĂŔŰÇŘžßÇÔ: %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "ĆŻÁ¤ %%docŔť ´Ů¸Ľ Çü˝Ä°ú ÇÔ˛˛ ťçżëÇŇ źö žřŔ˝: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "ĆÄŔĎ ¸ńˇĎŔĚ ÁßşšľĘ: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "BuildRootżĄ ˝Éşź¸Ż¸ľĹŠÇÔ: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "ĆÄŔĎŔĚ prefix (%s)żÍ ŔĎÄĄÇĎÁö žĘŔ˝: %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "ĆÄŔĎŔť ĂŁŔť źö žřŔ˝: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLeadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLeadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "ĆÄŔĎŔş \"/\" ˇÎ ˝ĂŔŰÇŘžßÇÔ: %s\n"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "GlobŔť ťçżëÇŇ źö žřŔ˝: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "globŔ¸ˇÎ ĆÄŔĎŔť ĂŁŔť źö žřŔ˝: %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%s ĆÄŔĎŔÇ %%files¸Ś ż­ źö žřŔ˝: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "Çŕ: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ŕ߸řľČ ĆÄŔĎ: %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ŕ߸řľČ źŇŔŻŔÚ/ą×ˇě: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "žĆÄŤŔ̺긌 ÇŞ´ÂľĽ ˝ÇĆĐÇÔ%s%s: %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ĆÄŔĎ Ăł¸Ž Áß: %s-%s-%s\n"
@@ -641,7 +654,7 @@ msgstr "cpio_copy ŔŰźşżĄ ˝ÇĆĐÇÔ: %s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy Ŕй⿥ ˝ÇĆĐÇÔ: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
@@ -651,122 +664,122 @@ msgstr "PreIn ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "ĆŽ¸Ž°Ĺ ˝şĹŠ¸łĆŽ ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "RPM ŔĐąâ(readRPM): %s(Ŕť)¸Ś żą´Ď´Ů: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "RPM ŔĐąâ(readRPM): %s(Ŕť)¸Ś ŔĐ˝Ŕ´Ď´Ů: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: FseekŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "RPM ŔĐąâ(readRPM): %s(Ŕş)´Â RPM ĆĐĹ°Áö°Ą žĆ´Ő´Ď´Ů\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "RPM ŔĐąâ(readRPM): %sżĄź­ Çě´ő¸Ś ŔĐ°í ŔÖ˝Ŕ´Ď´Ů\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 msgid "Unable to create immutable header region.\n"
 msgstr "°íÁ¤ Çě´ő żľżŞ(immutable header region)Ŕť ťýźşÇŇ źö žř˝Ŕ´Ď´Ů.\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 msgid "Unable to write temp header\n"
 msgstr "ŔÓ˝Ă(temp) Çě´ő¸Ś ŔŰźşÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "Ŕ߸řľČ CSA ľĽŔĚĹÍ\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 msgid "Unable to write final header\n"
 msgstr "¸śÁö¸ˇ(final) Çě´ő¸Ś ŔŰźşÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "ź­¸í ťýźş Áß: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 msgid "Unable to reload signature header.\n"
 msgstr "ź­¸í(signature) Çě´ő¸Ś ´Ů˝Ă ŔĐžîżĂ źö žř˝Ŕ´Ď´Ů.\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s(Ŕť)¸Ś ż­ źö žřŔ˝: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ĆĐĹ°Áö¸Ś ŔŰźşÇŇ źö žřŔ˝: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "ź­¸íÇŇ ´ëťó %s(Ŕť)¸Ś ż­ źö žřŔ˝: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%sŔÇ Çě´ő¸Ś ŔĐŔť źö žřŔ˝: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%sżĄ Çě´ő¸Ś ŔŰźşÇŇ źö žřŔ˝: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%sŔÇ payload¸Ś ŔĐŔť źö žřŔ˝: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%sżĄ payload¸Ś ŔŰźşÇŇ źö žřŔ˝: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "ŔŰźş: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s ĆĐĹ°ÁöŔÇ ĂâˇÂ ĆÄŔϸíŔť ťýźşÇŇ źö žřŔ˝: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s(Ŕť)¸Ś ťýźşÇŇ źö žřŔ˝: %s\n"
@@ -811,17 +824,17 @@ msgstr "%%changelogżĄ łťżë(description)ŔĚ žř˝Ŕ´Ď´Ů\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d šř° Çŕ: %%descriptionżĄź­ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů: %s\n"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d šř° Çŕ: %s(Ŕş)´Â Ŕ߸řľČ żÉźÇŔÔ´Ď´Ů: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "%d šř° Çŕ: Ŕ̸§ŔĚ łĘšŤ ¸š˝Ŕ´Ď´Ů: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "%d šř° Çŕ: ĆĐĹ°Áö°Ą Á¸ŔçÇĎÁö žĘ˝Ŕ´Ď´Ů: %s\n"
@@ -841,123 +854,128 @@ msgstr "%d šř° Çŕ: %%filesżĄź­ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "%d šř° Çŕ: ľÎšř° %%files ¸ńˇĎ\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "žĆĹ°ĹŘĂÄ°Ą ÁŚżÜľĘ: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "žĆĹ°ĹŘĂÄ°Ą Ć÷ÇԾǞî ŔÖÁö žĘŔ˝: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "żîżľĂźÁŚ°Ą ÁŚżÜľĘ: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "żîżľĂźÁŚ°Ą Ć÷ÇԾǞî ŔÖÁö žĘŔ˝: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "ĆĐĹ°ÁöżĄ šÝľĺ˝Ă %s Ç׸ń(field)Ŕť Ć÷ÇÔÇŘžßÇÔ: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "ĆĐĹ°ÁöżĄ %s Ç׸ń(entry)ŔĚ ÁßşšľÇžî ŔÖŔ˝: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "%s žĆŔĚÄÜŔť ż­ źö žřŔ˝: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "%s žĆŔĚÄÜŔť ŔĐŔť źö žřŔ˝: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "žË źö žř´Â žĆŔĚÄÜ ŔŻÇü: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "%d šř° Çŕ: Ĺ¹׿Ą ÇĎłŞŔÇ ĹäĹŤ¸¸ ŔÖ˝Ŕ´Ď´Ů: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "%d šř° Çŕ: żĂšŮ¸ŁÁö ¸řÇŃ ĹÂą×ŔÔ´Ď´Ů: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "%d šř° Çŕ: ĹÂą×°Ą şńžîŔÖ˝Ŕ´Ď´Ů: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "%d šř° Çŕ: %sżĄ şÎŔűÇŐÇŃ šŽŔÚ '-' °Ą ŔÖŔ˝: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot¸Ś \"/\" ˇÎ ÁöÁ¤ÇŇ źö žřŔ˝: %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "%d šř° Çŕ: Prefixes´Â Ŕý´ë \"/\" ˇÎ łĄłŞź­´Â žČľË´Ď´Ů: %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "%d šř° Çŕ: DocdirŔş šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů: %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "%d šř° Çŕ: Epoch/Serial Ç׸ń(field)Ŕş šÝľĺ˝Ă źýŔÚŔĚžîžß ÇŐ´Ď´Ů: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "%d šř° Çŕ: Ŕ߸řľČ %s: źö˝ÄŔÚ(qualifier): %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "%d šř° Çŕ: Ŕ߸řľČ BuildArchitecture Çü˝ÄŔÔ´Ď´Ů: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "łťşÎ żŔˇů: ş¸°Ĺ˝ş(Bogus) ĹÂą× %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ŕ߸řľČ ĆĐĹ°Áö ÁöÁ¤: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "ĆĐĹ°Áö°Ą ŔĚšĚ Á¸ŔçÇÔ: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "%d šř° Çŕ: žË źö žř´Â ĹÂą×ŔÔ´Ď´Ů: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec ĆÄŔĎŔş BuildRoot¸Ś ťçżëÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
@@ -1038,82 +1056,87 @@ msgstr ""
 "%d šř° Çŕ: ŔÇÁ¸źş ĹäĹŤ(token)Ŕş šÝľĺ˝Ă 'šŽŔÚ-źýŔÚ ÁśÇŐ', '_' śÇ´Â '/' ˇÎ ˝Ă"
 "ŔŰÇŘžß ÇŐ´Ď´Ů: %s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "%d šř° Çŕ: ÇŘ´ç ĆÄŔϸíŔť ťçżëÇŇ źö žř˝Ŕ´Ď´Ů: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "%d šř° Çŕ: šöŔüŔĚ ¸í˝ĂľČ ĆÄŔϸíŔť ťçżëÇŇ źö žř˝Ŕ´Ď´Ů: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "%d šř° Çŕ: šöŔüŔĚ ÇĘżäÇŐ´Ď´Ů: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "%d šř° Çŕ: ĆŽ¸Ž°Ĺ´Â šÝľĺ˝Ă '--' ¸Ś Ć÷ÇÔÇŘžß ÇŐ´Ď´Ů: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "%d šř° Çŕ: %sżĄź­ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "%d šř° Çŕ: ˝şĹŠ¸łĆŽ ÇÁˇÎą×ˇĽŔş šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů: %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "%d šř° Çŕ: ˝şĹŠ¸łĆŽ ÇÁˇÎą×ˇĽŔş šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů: %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "%d šř° Çŕ: ľÎšř° %s\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "%d šř° Çŕ: %%descriptionżĄź­ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "%d šř° Çŕ: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s(Ŕť)¸Ś ż­ źö žřŔ˝: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if°Ą ´ÝČ÷Áö žĘžŇ˝Ŕ´Ď´Ů\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBooleanżĄź­ %d °ŞŔĚ šÝČŻľÇžú˝Ŕ´Ď´Ů\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else°Ą %%if žřŔĚ ťçżëľÇžú˝Ŕ´Ď´Ů\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif°Ą %%if žřŔĚ ťçżëľÇžú˝Ŕ´Ď´Ů\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include šŽŔĚ żĂšŮ¸ŁÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ČŁČŻÇĎ´Â žĆĹ°ĹŘĂĸŚ ĂŁŔť źö žř˝Ŕ´Ď´Ů\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "ĆĐĹ°ÁöżĄ %%descriptionŔĚ žřŔ˝: %s\n"
@@ -1239,20 +1262,20 @@ msgstr "ĆĐĹ°Áö ÁŚŔŰ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "(ąâÁ¸ŔÇ) rpm[23] ĆĐĹ°ÂĄ°ú ČŁČŻÇĎ´Â ĆĐĹ°Áö Çě´ő¸Ś ťýźşÇŐ´Ď´Ů"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "ĆĐĹ°ÁöŔÇ žĆĹ°ĹŘĂĸŚ °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
@@ -1352,57 +1375,68 @@ msgstr "Çě´őżĄ žĆÄŤŔĚşę ĆÄŔĎŔĚ žř˝Ŕ´Ď´Ů"
 msgid " failed - "
 msgstr " ˝ÇĆĐÇÔ - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "%s ĆĐĹ°Áö´Â ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "%s ĆĐĹ°Áö´Â ŔĚšĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s żš (rpmrcŔĚ ÁŚ°řÇÔ)\n"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s żš (rpmlibŔĚ ÁŚ°řÇÔ)\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "Ŕ߸řľČ db ĆÄŔĎ %s\n"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s żš (db°Ą ÁŚ°řÇÔ)\n"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "´ŮŔ˝°ú °üˇĂľČ ĆĐĹ°Áö Ŕ̸§Ŕť šŤ˝ĂÇŐ´Ď´Ů [%d]\t%s -> %s\n"
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort °ü°čżĄź­ %s-%s-%s \"%s\"(Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort °ü°č¸Ś ąâˇĎ(record)ÇŐ´Ď´Ů\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
@@ -1410,27 +1444,27 @@ msgstr ""
 "========== ĆĐĹ°Áö¸Ś tsort ÇŐ´Ď´Ů (źřź­, #źąŔÓŔÚ, #ČÄŔÓŔÚ, ĆŽ¸Ž, ąíŔĚ"
 "[depth])\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== ČÄŔÓŔÚ¸¸ [successors only] (ÇĽÇö źř)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "ˇçÇÁ(LOOP):\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort¸Ś ÁřÇŕÇŐ´Ď´Ů...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(źýŔÚ°Ą žĆ´Ő´Ď´Ů)"
 
@@ -1442,7 +1476,7 @@ msgstr "(base64°Ą žĆ´Ő´Ď´Ů)"
 msgid "(invalid type)"
 msgstr "(şÎŔűÇŐÇŃ Ĺ¸ŔÔ)"
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr "(BLOB[Binary Large OBject]ŔĚ žĆ´Ő´Ď´Ů)"
 
@@ -1451,7 +1485,7 @@ msgstr "(BLOB[Binary Large OBject]ŔĚ žĆ´Ő´Ď´Ů)"
 msgid "(invalid xml type)"
 msgstr "(şÎŔűÇŐÇŃ Ĺ¸ŔÔ)"
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "žîś°ÇŃ PGP ź­¸íľľ °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
@@ -1471,7 +1505,7 @@ msgstr "mntctl()żĄź­ ¸śżîĆŽÇŇ ÁöÁĄŔť šÝČŻÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "%sŔÇ ťóĹÂ(stat)¸Ś ÇĽ˝ĂÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s(Ŕť)¸Ś żŠ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
@@ -1546,268 +1580,310 @@ msgstr "%s %s ¸ľĹŠ ÇŘÁŚżĄ ˝ÇĆĐÇÔ: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s(ŔĚ)°Ą %s(Ŕ¸)ˇÎ ťýźşľÇžú˝Ŕ´Ď´Ů\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "%2$s ŔÎľŚ˝şżĄ %1$d Ç׸ńľé(entries)Ŕť Ăß°ĄÇŐ´Ď´Ů.\n"
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s %s(Ŕť)¸Ś ťýźşÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s(Ŕť)¸Ś ŔŰźşÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "Ŕӽà ĆÄŔĎ %s(Ŕť)¸Ś ťýźşÇĎ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ŔĚ RPM šöŔüŔş ĆĐĹ°ÂĄ šöŔü '1' Ŕť ÁöżřÇĎÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ŔĚ RPM šöŔüŔş ÁÖ šřČŁ(major number)°Ą <= 4 ŔÎ ĆĐĹ°ÂĄ ¸¸Ŕť ÁöżřÇŐ´Ď´Ů\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignatureŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ŔŻČżÇŃ ź­¸íŔĚ žř˝Ŕ´Ď´Ů\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLeadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: FreadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "%s ľđˇşĹ与¸Ś ťýźşÇŐ´Ď´Ů\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "<ÇĽÇö˝Ä>+ ŔÇ ¸ĹĹŠˇÎ ČŽŔĺŔť ĂâˇÂÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "ąâşť ¸ĹĹŠˇÎ ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "libio(3) APIŔÇ ťçżëŔť ÇŘÁŚÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "ÇĽÁŘĂâˇÂŔť <¸íˇÉ>Ŕ¸ˇÎ ş¸łŔ´Ď´Ů"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "<ľđˇşĹ与>¸Ś ĂÖťóŔ§ ľđˇşĹ与ˇÎ ťçżëÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "ÁúŔÇ Ĺ¹׸Ś ş¸żŠÁÝ´Ď´Ů"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "ÇöŔç źłÁ¤ľÇžî ŔÖ´Â rpmrcŔÇ łťżë°ú ¸ĹĹŠˇÎ¸Ś ş¸żŠÁÝ´Ď´Ů"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "ŔÚźźÇŃ ĂâˇÂŔť ÁŚ°řÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "žĆÁÖ ťóźźÇŃ ĂâˇÂŔť ÁŚ°řÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "ÇöŔç ťçżëľÇ°í ŔÖ´Â rpm šöŔüŔť ÇĽ˝ĂÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "ÄÄÇťĹÍŔÇ ťóĹÂ(state) ĆÄŔĎŔť ľđšöą× ÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "ÄÄÇťĹÍŔÇ ťóĹÂ(state) ĆÄŔĎŔť ľđšöą× ÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "ľĽŔĚĹÍ ˝şĆŽ¸˛ ÇÁˇÎĹäÄÝŔť ľđšöą× ÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "ŔÎźö Ăł¸Ž°úÁ¤ (%d) ľľÁß łťşÎ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů :-(\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "ÄÄÇťĹÍŔÇ ťóĹÂ(state) ĆÄŔĎŔť ľđšöą× ÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "ÄÄÇťĹÍŔÇ ťóĹÂ(state) ĆÄŔĎŔť ľđšöą× ÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "rpmio ŔÔ/ĂâˇÂŔť ľđšöą× ÇŐ´Ď´Ů"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "URL Äł˝Ă Çھ鸾Ŕť ľđšöą× ÇŐ´Ď´Ů"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "ÁŚżÜ˝ĂĹł °ćˇÎ´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "ŔçščÄĄ˝ĂżĄ´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "ŔçščÄĄ˝ĂżĄ´Â šÝľĺ˝Ă '=' Ŕť Ć÷ÇÔÇŘžß ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "ŔçščÄĄ˝ĂżĄ´Â šÝľĺ˝Ă '=' ľÚżĄ '/' °Ą żÍžß ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr "ˇŃšé(rollback)ŔÇ ŔÎźö´Â ˝Ă°Ł/łŻÂĽ ˝şĹĆÇÁ ŔÔ´Ď´Ů"
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr "ˇŃšé(rollback)ŔÇ ŔÎźöŔÎ ˝Ă°Ł/łŻÂĽ ˝şĹĆÇÁ°Ą żĂšŮ¸ŁÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "źłÄĄ łťżëŔť ĹëÇŘ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "ĆŻÁ¤ ĆÄŔĎŔť ťýˇŤÇĎąâ Ŕ§ÇŃ źłÁ¤ŔĚ ŔűżëľČ °ćżěżĄľľ, ĆĐĹ°Áö žČŔÇ ¸đľç ĆÄŔĎŔť źł"
 "ÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1815,159 +1891,168 @@ msgstr ""
 "<ĆĐĹ°Áö> Ŕ̸§°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö´Â ¸đľÎ ÁŚ°ĹÇŐ´Ď´Ů (<ĆĐĹ°Áö>żĄ żŠˇŻ°łŔÇ ĆĐĹ°Áö"
 "¸Ś ľż˝ĂżĄ ÁöÁ¤ÇŇ °ćżěżĄ´Â żŔˇů°Ą šßťýÇŐ´Ď´Ů)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "ĆĐĹ°Áö ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "ŔçščÄĄ ąâ´ÉŔĚ žř´Â ĆĐĹ°ÁöŔÇ ĆÄŔĎŔť ŔçščÄĄÇĎżŠ źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr "ÇĎşÎ-ľđˇşĹ与ˇÎ Ŕ̸§ şŻ°ć˝Ă ťčÁŚľČ ĆĐĹ°Áö ĆÄŔĎŔť ŔúŔĺÇŐ´Ď´Ů"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "ĆĐĹ°Áö¸Ś (ÁŚ°Ĺ) ťčÁŚÇŐ´Ď´Ů"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<ĆĐĹ°Áö>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "¸đľç źłÁ¤ ĆÄŔĎŔť łŞż­ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "ĆĐĹ°ÁöżĄ Ć÷ÇÔľČ šŽź­ ĆÄŔĎŔť źłÄĄÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "<°ćˇÎ>ˇÎ ˝ĂŔ۾Ǵ ĆÄŔĎŔş źłÄĄÇĎÁö žĘ˝Ŕ´Ď´Ů "
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<°ćˇÎ>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "ŔçščÄĄ ąâ´ÉŔĚ žř´Â ĆĐĹ°ÁöŔÇ ĆÄŔĎŔť ŔçščÄĄÇĎżŠ źłÄĄÇŐ´Ď´Ů"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs żÍ --replacefiles żÉźÇŔť ľż˝ĂżĄ ťçżëÇŐ´Ď´Ů"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "ąâÁ¸żĄ źłÄĄľČ ĆĐĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺ ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<ĆĐĹ°ÁöĆÄŔĎ>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "ĆĐĹ°Áö źłÄĄ¸Ś ÇؽøśĹŠ(#)ˇÎ ÇĽ˝ĂÇŐ´Ď´Ů (-v żÉźÇ°ú ÇÔ˛˛ ťçżëÇĎ´Â °ÍŔĚ ÁÁ˝Ŕ´Ď"
 "´Ů)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "ĆĐĹ°ÁöŔÇ žĆĹ°ĹŘĂĸŚ °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "ĆĐĹ°ÁöŔÇ żîżľĂźÁŚ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇĎąâ ŔüżĄ ľđ˝şĹŠ °ř°ŁŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "ĆĐĹ°ÁöżĄ Ć÷ÇÔľČ šŽź­ ĆÄŔĎŔť źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "ĆÄŔϽýşĹŰŔť şŻ°ćÇĎÁö žĘ°í, ľĽŔĚĹÍşŁŔĚ˝ş¸Ś °ť˝ĹÇŐ´Ď´Ů"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "ĆÄŔĎŔÇ MD5 Ăŕžŕ(digest)Ŕť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "¸đľç źłÁ¤ ĆÄŔĎŔť łŞż­ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ŔÇÁ¸źşŔĚ ŔÖ´Â ĆĐĹ°Áö¸Ś źłÄĄÇĎľľˇĎ Ŕçżäą¸ÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "%%pre ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "%%post ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "%%preun ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "%%postun ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 "ŔĚ ĆĐĹ°ÁöżĄ ŔÇÇŘ ťýźşľÇ´Â(triggered) žîś°ÇŃ ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö "
 "žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "žîś°ÇŃ %%triggerprein ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "žîś°ÇŃ %%triggerin ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "žîś°ÇŃ %%triggerun ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "žîś°ÇŃ %%triggerpostun ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1975,476 +2060,493 @@ msgstr ""
 "ŔĚŔü šöŔüŔÇ ĆĐĹ°ÁöˇÎ ´Ůżîą×ˇšŔĚľĺ ÇŐ´Ď´Ů (--force żÉźÇŔť ťçżë˝ĂżĄ´Â ŔĚ żÉźÇ"
 "ŔĚ ŔÚľżŔ¸ˇÎ ŔűżëľË´Ď´Ů)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "ĆĐĹ°Áö źłÄĄ¸Ś ĆŰźžĆŽ(%)ˇÎ ÇĽ˝ĂÇŐ´Ď´Ů"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "ŔçščÄĄ ąâ´ÉŔĚ ŔÖ´Â ĆĐĹ°ÁöŔÇ °ćżě, ÁöÁ¤ÇŃ <ľđˇşĹ与>ˇÎ ŔçščÄĄÇĎżŠ źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<ľđˇşĹ与>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "<ŔĚŔü°ćˇÎ>żĄź­ <ťőˇÎżî°ćˇÎ>ˇÎ ĆÄŔĎŔť ŔçščÄĄ ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<ŔĚŔü°ćˇÎ>=<ťőˇÎżî°ćˇÎ>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr "ŔçĆĐĹ°ÂĄ(repackaging)Ŕ¸ˇÎ ŔÎÇŘ ťčÁŚľÇ´Â ĆĐĹ°Áö ĆÄŔĎŔť ŔúŔĺÇŐ´Ď´Ů"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "ĆĐĹ°Áö źłÄĄ˝Ă ąâÁ¸żĄ źłÄĄľÇžî ŔÖ´Â ĆÄŔĎŔť ľ¤žîžš´Ď´Ů"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "ĆĐĹ°Áö°Ą ŔĚšĚ źłÄĄľÇžî ŔÖ´Â °ćżěżĄľľ źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "ťőˇÎ źłÄĄ ťčÁŚ, ŔĚŔü źłÄĄ Ŕ石ĥ, ĆĐĹ°Áö, <łŻÂĽ> şšą¸(back to date)"
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr "<łŻÂĽ>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇĎÁö žĘ°í, ÁŚ´ëˇÎ źłÄĄľÇ´ÂÁö¸¸ ČŽŔÎÇŐ´Ď´Ů"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "ĆĐĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺ ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "¸đľç ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇ/°ËÁőÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "rpm °ËÁő ¸đľĺ"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "ĆÄŔĎŔĚ ľéžîŔÖ´Â ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
-msgstr "ĆÄŔĎ ˝Äş°ŔÚ(identifier)¸Ś ťçżëÇĎżŠ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
-
-#: lib/poptQV.c:103
+#: lib/poptQV.c:108
 msgid "query/verify package(s) in group"
 msgstr "ą×ˇě žČŔÇ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
-msgstr "Çě´ő ˝Äş°ŔÚ(identifier)¸Ś ťçżëÇĎżŠ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
-
-#: lib/poptQV.c:107
+#: lib/poptQV.c:110
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "¸đľç ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇ/°ËÁőÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
+msgstr "źłÄĄ łťżëŔť ĹëÇŘ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
+
+#: lib/poptQV.c:115
+#, fuzzy
+msgid "query/verify package(s) from system HDLIST"
+msgstr "źłÄĄ łťżëŔť ĹëÇŘ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
+
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr "ĆĐĹ°Áö ˝Äş°ŔÚ(identifier)¸Ś ťçżëÇĎżŠ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr "Çě´ő ˝Äş°ŔÚ(identifier)¸Ś ťçżëÇĎżŠ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr "ĆÄŔĎ ˝Äş°ŔÚ(identifier)¸Ś ťçżëÇĎżŠ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "rpm ÁúŔÇ ¸đľĺ"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "Çě´ő ˝Äş°ŔÚ(identifier)¸Ś ťçżëÇĎżŠ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "spec ĆÄŔĎżĄ ´ëÇŘ ÁúŔÇÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<spec>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr "źłÄĄ łťżëŔť ĹëÇŘ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "ĆĐĹ°ÁöˇÎ ŔÎÇŘ ťýźşľÇ´Â(triggered) ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "rpm °ËÁő ¸đľĺ"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "ŔÇÁ¸źşŔť ÇĘżäˇÎ ÇĎ´Â ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "ŔÇÁ¸źşŔť ÁŚ°řÇĎ´Â ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: 0x%xŔÇ Çě´ő¸Ś ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "¸đľç źłÁ¤ ĆÄŔĎŔť łŞż­ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "¸đľç šŽź­ ĆÄŔĎŔť łŞż­ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "ąâşť ĆÄŔĎ Á¤ş¸¸Ś ş¸żŠÁÝ´Ď´Ů"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "ĆĐĹ°Áö žČŔÇ ĆÄŔĎŔť łŞż­ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr "%%ghost ĆÄŔĎŔť ťýˇŤÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr "%%license ĆÄŔĎŔť ťýˇŤÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr "%%readme ĆÄŔĎŔť ťýˇŤÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "´ŮŔ˝ŔÇ ÁúŔÇ Çü˝ÄŔť ťçżëÇϽʽÿä"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "spec ĆÄŔĎ žČŔÇ i18n Ç׸ń(section)Ŕť ´ëĂź(substitute)ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "łŞż­ľČ ĆÄŔĎŔÇ ťóĹÂ(state)¸Ś ş¸żŠÁÝ´Ď´Ů"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "ĆÄŔĎŔÇ żëˇŽŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "ĆÄŔĎŔÇ ˝Éşź¸Ż ¸ľĹŠ °ćˇÎ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "ĆÄŔĎŔÇ źŇŔŻŔÚ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "ĆÄŔĎŔÇ ą×ˇěŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "ĆÄŔĎŔÇ ĂÖÁž şŻ°ć ˝Ă°ŁŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "ĆÄŔĎŔÇ ¸đľĺ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "ĆĐĹ°Áö žČŔÇ ĆÄŔĎŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "ĆĐĹ°Áö žČŔÇ ĆÄŔĎŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "%verifyscript¸Ś ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "SHA1 Ăŕžŕ(digest) Çě´ő¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ĆÄŔĎŔÇ MD5 Ăŕžŕ(digest)Ŕť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "ĆĐĹ°ÁöżĄ ź­¸íÇŐ´Ď´Ů (ąâÁ¸ŔÇ ź­¸íŔş ťčÁŚľË´Ď´Ů)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "ĆĐĹ°ÁöżĄ ź­¸íÇŐ´Ď´Ů (ąâÁ¸ŔÇ ź­¸íŔş ťčÁŚľË´Ď´Ů)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "ź­¸íŔť ŔŰźşÇŐ´Ď´Ů"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr "źŇ˝ş ĆĐĹ°Áö°Ą ÇĘżäÇϸç, šŮŔ̳ʸŽ°Ą °ËťöľÇžú˝Ŕ´Ď´Ů\n"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "źŇ˝ş ĆĐĹ°ÁöżĄ .spec ĆÄŔĎŔĚ Ć÷ÇԾǞî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: %s ˝şĹŠ¸łĆŽ¸Ś ˝ÇÇŕÇŐ´Ď´Ů (ŔÖŔť °ćżě)\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 "%s: %s ˝şĹŠ¸łĆ˛¸´(scriptlet)ŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů (%d), %s-%s-%s(Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 "%2$s-%3$s-%4$sŔÇ %1$s ˝şĹŠ¸łĆ˛¸´(scriptlet) ˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů, Ážˇá ťóȲ %5"
 "$d\n"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%sżĄ %dŔÇ ĆÄŔĎŔĚ ŔÖ˝Ŕ´Ď´Ů, Ĺ×˝şĆŽ = %d\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 "%s: %s ˝şĹŠ¸łĆ˛¸´(scriptlet)ŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů (%d), %s-%s-%s(Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů\n"
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "ź­¸í(signature) Çě´ő¸Ś ´Ů˝Ă ŔĐžîżĂ źö žř˝Ŕ´Ď´Ů.\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "žĆÄŤŔ̺긌 ÇŞ´ÂľĽ ˝ÇĆĐÇÔ%s%s: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " ´ŮŔ˝ ĆÄŔĎŔÇ "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ĆÄŔĎŔÇ %1$s(ŔĚ)°Ą ˝ÇĆĐÇÔ: %3$s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s(ŔĚ)°Ą ˝ÇĆĐÇÔ: %s\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "żĂšŮ¸ŁÁö ¸řÇŃ Çü˝Ä: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(ĆÄŔĎŔĚ Ć÷ÇԾǞî ŔÖÁö žĘŔ˝)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "Á¤ťó(normal)        "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "ąłĂźľĘ(replaced)    "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "źłÄĄľÇžî ŔÖÁö žĘŔ˝  "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "net °řŔŻľĘ          "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(ťóŸŚ žË źö žřŔ˝) "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(žË źö žř´Â %3d)    "
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "ĆĐĹ°ÁöżĄ ĆÄŔĎ źŇŔŻŔÚ śÇ´Â id ¸ńˇĎŔĚ žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "ĆĐĹ°ÁöżĄ ĆÄŔĎ źŇŔŻŔÚ śÇ´Â id ¸ńˇĎŔĚ žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "%s(Ŕť)¸Ś żŠ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "%s(Ŕť)¸Ś ÁúŔÇÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "ŔĚŔü Çü˝ÄŔÇ źŇ˝ş ĆĐĹ°Áö´Â ÁúŔÇÇŇ źö žř˝Ŕ´Ď´Ů\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "%s(żÍ)°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö°Ą žřŔ˝: %s\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "žË źö žř´Â ĹÂą× ŔÔ´Ď´Ů"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s ą×ˇěŔş žîś˛ ĆĐĹ°ÁöżĄľľ Ć÷ÇԾǞî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s(Ŕť)¸Ś ťýźşÇĎ´Â(trigger) ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s(ŔĚ)°Ą Ŕ߸řľĘ: %s\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s(żÍ)°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö°Ą žřŔ˝: %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s(Ŕť)¸Ś ÇĘżäˇÎ ÇĎ´Â ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s(Ŕť)¸Ś ÁŚ°řÇĎ´Â ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "%s ĆÄŔĎ: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s ĆÄŔĎŔş žîś˛ ĆĐĹ°ÁöżĄľľ ľéžîŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "şÎŔűÇŐÇŃ ĆĐĹ°Áö šřČŁ: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ĆĐĹ°Áö ąâˇĎ(record) šřČŁ: %u\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "ąâˇĎ(record) šřČŁ %u(Ŕş)´Â ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ĆĐĹ°Áö°Ą źłÄĄľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "Ŕ߸řľČ db ĆÄŔĎ %s\n"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s żš (ÁŚ°řŔĚ Ăß°ĄľĘ)\n"
@@ -2542,15 +2644,15 @@ msgstr ")"
 msgid "OK"
 msgstr "ČŽŔÎ"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr "žĆ´ĎżŔ"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr "żš"
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2559,13 +2661,13 @@ msgstr ""
 "\"B\" ŔÇÁ¸źşŔş Áßżä˝Ă ľÇ´Â °Í(epoch)Ŕť ÇĘżäˇÎ ÇŐ´Ď´Ů (\"A\" ˇÎ °ĄÁ¤ÇŐ´Ď´Ů)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "%s ĆĐĹ°ÁöŔÇ ÇĘżäťçÇ×(łťżŞ)ŔĚ ¸¸ÁˇÇĎÁö žĘŔ˝: %s\n"
@@ -2575,158 +2677,187 @@ msgstr "%s ĆĐĹ°ÁöŔÇ ÇĘżäťçÇ×(łťżŞ)ŔĚ ¸¸ÁˇÇĎÁö žĘŔ˝: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok Ç᥹סΠŔÎÇŘ %s(Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr "========== ŔçščÄĄ\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ÁŚżÜ  %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ŔçščÄĄ %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s(Ŕť)¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s(Ŕť)¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s ľđˇşĹ与¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "%s(Ŕť)¸Ś żŠ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "žË źö žř´Â ĹÂą× ŔÔ´Ď´Ů"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇŘ ˝ÇĆĐÇÔ:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "ÁŘşń Áß..."
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr "źłÄĄÇŇ ĆĐĹ°Áö¸Ś ÁŘşńÇĎ°í ŔÖ˝Ŕ´Ď´Ů..."
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 #, fuzzy
 msgid "Repackaging..."
 msgstr "ÁŘşń Áß..."
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 #, fuzzy
 msgid "Upgrading..."
 msgstr "ÁŘşń Áß..."
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "ĆĐĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺ ÇŐ´Ď´Ů"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "%s(Ŕť)¸Ś ĂŁ´Â Áß: (%s ťçżë)...\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s(Ŕť)¸Ś şšą¸ÇŐ´Ď´Ů\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... %s(Ŕ¸)ˇÎ\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s(Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů - ŔüźŰ(transfer)żĄ ˝ÇĆĐÇÔ - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s(Ŕş)´Â źłÄĄÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<źŇ˝ş ĆĐĹ°Áö>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "%s ĆĐĹ°Áö´Â ŔçščÄĄÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "šŮŔ̳ʸŽ ĆĐĹ°Áö¸Ś źłÄĄÇŐ´Ď´Ů\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s ĆÄŔĎŔť ŔĐ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "%s ĆÄŔĎŔş ĂֽŠšöŔüŔÇ RPMŔť ÇĘżäˇÎ ÇŐ´Ď´Ů\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "%s(żÍ)°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö°Ą žřŔ˝: %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%dŔÇ źŇ˝şżÍ %dŔÇ šŮŔ̳ʸŽ ĆĐĹ°Áö°Ą °ËťöľÇžú˝Ŕ´Ď´Ů\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "ŔÇÁ¸źş šŽÁŚˇÎ ŔÎÇŘ ˝ÇĆĐÇÔ:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "šŮŔ̳ʸŽ ĆĐĹ°Áö¸Ś źłÄĄÇŐ´Ď´Ů\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s ĆÄŔĎŔť ż­ źö žřŔ˝: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" żŠˇŻ°łŔÇ ĆĐĹ°Áö¸Ś ÁöÁ¤ÇŐ´Ď´Ů\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s(Ŕť)¸Ś ż­ źö žřŔ˝: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s(Ŕť)¸Ś źłÄĄÇŐ´Ď´Ů\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "%s(Ŕť)¸Ś şšą¸ÇŐ´Ď´Ů\n"
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2741,7 +2872,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2768,6 +2899,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "'-' ´Â šŽŔÚż­żĄź­ ťçżëÇŇ źö žř˝Ŕ´Ď´Ů\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2849,174 +2985,229 @@ msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 "%2$s ĆĐĹ°Áö¸Ś Ăł¸ŽÇĎ´Â °úÁ¤żĄź­ žË źö žř´Â żŔˇů %1$d(ŔĚ)°Ą šßťýÇß˝Ŕ´Ď´Ů"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "%sżĄ ľÎšř° ':' ŔĚ žřŔ˝:%d\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%sżĄ žĆĹ°ĹŘĂĸíŔĚ žřŔ˝:%d\n"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%sŔÇ ľĽŔĚĹÍ Ç׸ń(line)ŔĚ şŇĂćşĐÇÔ:%d\n"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%sŔÇ ľĽŔĚĹÍ Ç׸ń(line)żĄ ŔÎźö°Ą łĘšŤ ¸šŔ˝:%d\n"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Ŕ߸řľČ žĆĹ°ĹŘĂÄ/żîżľĂźÁŚ šřČŁ: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%sŔÇ ąâşť Ç׸ń(line)ŔĚ şŇĂćşĐÇÔ:%d\n"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%sŔÇ ąâşť Ç׸ń(line)żĄ ŔÎźö°Ą łĘšŤ ¸šŔ˝:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s(Ŕť)¸Ś ŔĐ´ÂľĽ ˝ÇĆĐÇÔ: %s.\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "%2$sżĄ ':' (0x%1$02x ĂŁŔ˝) ŔĚ žřŔ˝:%3$d\n"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%2$sżĄ %1$s(Ŕť)¸Ś Ŕ§ÇŃ ŔÎźö°Ą žřŔ˝:%3$d\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%2$sŔÇ %1$s ČŽŔĺ(expansion)żĄ ˝ÇĆĐÇÔ:%3$d \"%4$s\"\n"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%2$sŔÇ %1$s(Ŕť)¸Ś ż­ źö žřŔ˝:%3$d: %4$s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%2$sżĄ %1$s(Ŕť)¸Ś Ŕ§ÇŃ žĆĹ°ĹŘĂÄ°Ą žřŔ˝:%3$d\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "%2$sżĄ Ŕ߸řľČ '%1$s' żÉźÇ:%3$d\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "žË źö žř´Â ˝Ă˝şĹŰ: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "rpm-list@redhat.comŔ¸ˇÎ żŹśôšŮśř´Ď´Ů\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "%s(Ŕť)¸Ś ČŽŔĺ(expand)ÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "%s(Ŕť)¸Ś ŔĐŔť źö žř˝Ŕ´Ď´Ů, HOMEŔĚ łĘšŤ ĹŽ´Ď´Ů.\n"
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s(Ŕť)¸Ś ż­ źö žřŔ˝: %s.\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s žČŔÇ ĆĐĹ°Áö ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ż­ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "şÎŔűÇŐÇŃ ĆĐĹ°Áö šřČŁ: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "%s %sżĄ '(' °Ą žř˝Ŕ´Ď´Ů\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "şÎŔűÇŐÇŃ ĆĐĹ°Áö šřČŁ: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "%sŔÇ rpm ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ż­ źö žř˝Ŕ´Ď´Ů\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "Çŕ: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "%s(Ŕť)¸Ś şšą¸ÇŐ´Ď´Ů\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "%s(Ŕť)¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3033,6 +3224,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3057,6 +3249,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3124,6 +3317,9 @@ msgstr "%d šŮŔĚĆŽŔÇ GPG ź­¸íŔť žňžú˝Ŕ´Ď´Ů\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3148,44 +3344,167 @@ msgstr "Çě´őŔÇ ĹŠąâ°Ą łĘšŤ ĹŽ´Ď´Ů"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "SHA1 Ăŕžŕ(digest) Çě´ő¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "žîś°ÇŃ MD5 ź­¸íľľ °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "ź­¸íŔĚ žř˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "źŐťóľČ MD5 Ăŕžŕ(digest): ÁöżřÇĎÁö žĘŔ˝\n"
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "ź­¸í: size(%d)+pad(%d)\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s ľđˇşĹ与¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "źŇ˝ş ĆĐĹ°Áö°Ą ÇĘżäÇϸç, šŮŔ̳ʸŽ°Ą °ËťöľÇžú˝Ŕ´Ď´Ů\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "%s(żÍ)°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö°Ą žřŔ˝: %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<źŇ˝ş ĆĐĹ°Áö>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<źŇ˝ş ĆĐĹ°Áö>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "ĆĐĹ°ÁöŔÇ Çě´ő¸Ś ŔĐ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3194,11 +3513,15 @@ msgstr "%s ľđˇşĹ与¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3207,7 +3530,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3215,13 +3538,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "´ŮŔ˝Ŕť ĂŁŔť źö žřŔ˝    %s"
 
 #: lib/verify.c:437
@@ -3254,135 +3601,135 @@ msgstr "ťčÁŚľČ  db ČŻ°ć        %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "żŠ´ÂÁß  db ČŻ°ć        %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "´ÝČů    db ŔÎľŚ˝ş      %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "°ËÁőľČ  db ŔÎľŚ˝ş      %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "żŠ´ÂÁß  db ŔÎľŚ˝ş      %s/%s %s ¸đľĺ=0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%2$s/%3$sŔÇ ŔáąÝľČ(lock) %1$s(Ŕť)¸Ś žňŔť źö žř˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "ĆóźâŔű(exclusive)"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "°řŔŻľĘ"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "ŔáąÝľČ  db ŔÎľŚ˝ş      %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "ŔÎÁőľÇÁö žĘŔş db żÉźÇ: \"%s\"(Ŕť)¸Ś šŤ˝ĂÇŐ´Ď´Ů.\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s(Ŕş)´Â şÎŔűÇŐÇŃ źöÄĄ °ŞŔÔ´Ď´Ů, ťýˇŤÇŐ´Ď´Ů\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s(Ŕş)´Â łĘšŤ ĹŠ°ĹłŞ łĘšŤ ŔűŔş Á¤źö(long) °ŞŔÔ´Ď´Ů, ťýˇŤÇŐ´Ď´Ů\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s(Ŕş)´Â łĘšŤ ĹŠ°ĹłŞ łĘšŤ ŔűŔş Á¤źö(int) °ŞŔÔ´Ď´Ů, ťýˇŤÇŐ´Ď´Ů\n"
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "'%' ľÚżĄ '{' °Ą žř˝Ŕ´Ď´Ů"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "'%{' ľÚżĄ '}' °Ą žř˝Ŕ´Ď´Ů"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "ĹÂą× Çü˝ÄŔĚ şńžîŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "ĹÂą× Ŕ̸§ŔĚ şńžîŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "žË źö žř´Â ĹÂą× ŔÔ´Ď´Ů"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "ščż­ŔÇ łĄşÎşĐżĄ ']' °Ą żÍžßÇŐ´Ď´Ů"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "şŇÇĘżäÇŃ ']' °Ą ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "şŇÇĘżäÇŃ '}' °Ą ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "ÇĽÇö˝ÄżĄ '?' °Ą żÍžßÇŐ´Ď´Ů"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "ÇĽÇö˝ÄŔÇ '?' ľÚżĄ '{' °Ą żÍžßÇŐ´Ď´Ů"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "ÇĽÇö˝ÄżĄ '}' °Ą żÍžßÇŐ´Ď´Ů"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "'?' ÇĎşÎÇĽÇö˝Ä(subexpression) ľÚżĄ ':' ŔĚ żÍžßÇŐ´Ď´Ů"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "ÇĽÇö˝ÄŔÇ ':' ľÚżĄ '{' °Ą żÍžßÇŐ´Ď´Ů"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "ÇĽÇö˝ÄŔÇ łĄşÎşĐżĄ '|' °Ą żÍžßÇŐ´Ď´Ů"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3409,332 +3756,332 @@ msgstr "ľĽŔĚĹÍşŁŔĚ˝ş ĆÄŔĎŔť °ËťçÇŐ´Ď´Ů"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "(ąâÁ¸ŔÇ) rpm[23] ĆĐĹ°ÂĄ°ú ČŁČŻÇĎ´Â Çě´ő¸Ś ťýźşÇŐ´Ď´Ů"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 "DB ĹÂą× ĂĘąâČ­[dbiTagsInit]: ŔÎÁőľÇÁö žĘŔş ĹÂą× Ŕ̸§: \"%s\"(Ŕş)´Â šŤ˝ĂľË´Ď"
 "´Ů\n"
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "db%2$d(Ŕť)¸Ś ŔĚżëÇĎżŠ %1$s ŔÎľŚ˝ş¸Ś ż­ źö žř˝Ŕ´Ď´Ů - %3$s (%4$d)\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "%s ŔÎľŚ˝ş¸Ś ż­ źö žř˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr "db°ćˇÎ°Ą źłÁ¤ľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s ŔÎľŚ˝şżĄź­ \"%2$s\" ˇšÄھ希 žň´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "%3$s(Ŕ¸)ˇÎ %2$s ˇšÄھ希 ŔúŔĺÇĎ´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: źŐťóľČ Çě´ő #%u(ŔĚ)°Ą şšą¸(retrieved)ľÇžú˝Ŕ´Ď´Ů, ťýˇŤÇŐ´Ď´Ů.\n"
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%xŔÇ Çě´ő¸Ś ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 "%3$s ŔÎľŚ˝şżĄź­ \"%2$s\" ˇšÄھ希 žň´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%2$s ŔÎľŚ˝şżĄź­ \"%1$s\"(Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%2$s ŔÎľŚ˝şżĄź­ %1$d Ç׸ńľé(entries)Ŕť ťčÁŚÇŐ´Ď´Ů.\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s ŔÎľŚ˝şżĄź­ \"%2$s\" ˇšÄھ希 žň´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "%3$s(Ŕ¸)ˇÎ %2$s ˇšÄھ希 ŔúŔĺÇĎ´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "%3$sżĄź­ %2$s ˇšÄھ希 ťčÁŚÇĎ´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "ťőˇÎżî ĆĐĹ°Áö¸Ś ščÄĄÇĎ´Â ľľÁß żŔˇů(%d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: źŐťóľČ Çě´ő #%u(ŔĚ)°Ą şšą¸(retrieved)ľÇžú˝Ŕ´Ď´Ů, ťýˇŤÇŐ´Ď´Ů.\n"
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%2$s ŔÎľŚ˝şżĄ \"%1$s\"(Ŕť)¸Ś Ăß°ĄÇŐ´Ď´Ů.\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%2$s ŔÎľŚ˝şżĄ %1$d Ç׸ńľé(entries)Ŕť Ăß°ĄÇŐ´Ď´Ů.\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "%3$s(Ŕ¸)ˇÎ %2$s ˇšÄھ希 ŔúŔĺÇĎ´Â ľľÁß żŔˇů(%1$d)°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "db3¸Ś Ŕ繸ĂŕÇŃ ČÄżĄ %s(Ŕť)¸Ś ťčÁŚÇŐ´Ď´Ů.\n"
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "db°ćˇÎ°Ą źłÁ¤ľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%2$sżĄ %1$s ľĽŔĚĹÍşŁŔĚ˝ş¸Ś Ŕ繸Ăŕ ÇŐ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "Ŕӽà ľĽŔĚĹÍşŁŔĚ˝ş %s(ŔĚ)°Ą ŔĚšĚ Á¸ŔçÇŐ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s ľđˇşĹ与¸Ś ťýźşÇŐ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s ľđˇşĹ与¸Ś ťýźşÇÔ: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "dbapi %dˇÎ ŔĚŔü ľĽŔĚĹÍşŁŔĚ˝ş¸Ś żą´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "dbapi %dˇÎ ťőˇÎżî ľĽŔĚĹÍşŁŔĚ˝ş¸Ś żą´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "ľĽŔĚĹÍşŁŔĚ˝şŔÇ ˇšÄÚľĺ šřČŁ %u(ŔĚ)°Ą Ŕ߸řľÇžú˝Ŕ´Ď´Ů -- ťýˇŤÇŐ´Ď´Ů.\n"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%użĄ ĂłŔ˝şÎĹÍ ˇšÄھ希 Ăß°ĄÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ľĽŔĚĹÍşŁŔĚ˝ş¸Ś Ŕ繸ĂŕÇĎ´ÂľĽ ˝ÇĆĐÇÔ: żřşť ľĽŔĚĹÍşŁŔĚ˝ş´Â ą×´ëˇÎ ŔŻÁöľË´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "ŔĚŔü ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ťőˇÎżî ľĽŔĚĹÍşŁŔĚ˝şˇÎ ąłĂźÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "şšą¸ÇĎąâ Ŕ§ÇŘ %2$sŔÇ ĆÄŔĎŔť %1$sŔÇ ĆÄŔϡΠąłĂźÇŐ´Ď´Ů"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s ľđˇşĹ与¸Ś ťčÁŚÇŐ´Ď´Ů\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s ľđˇşĹ与¸Ś ťčÁŚÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d Č°źş %d şńžîŔÖŔ˝\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(şńžîŔÖŔ˝)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(şńžîŔÖŔ˝)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "¸ĹĹŠˇÎ %%%sżĄ ÁžˇáľÇÁö žĘŔş łťżë(body)ŔĚ ŔÖ˝Ŕ´Ď´Ů\n"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "¸ĹĹŠˇÎ %%%sżĄ şÎŔűÇŐÇŃ Ŕ̸§ŔĚ ŔÖ˝Ŕ´Ď´Ů (%%define)\n"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "¸ĹĹŠˇÎ %%%sżĄ ÁžˇáľÇÁö žĘŔş żÉźÇŔĚ ŔÖ˝Ŕ´Ď´Ů\n"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "¸ĹĹŠˇÎ %%%sżĄ şńžîŔÖ´Â łťżë(body)ŔĚ ŔÖ˝Ŕ´Ď´Ů\n"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "¸ĹĹŠˇÎ %%%s(Ŕť)¸Ś ČŽŔĺ(expand)ÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "¸ĹĹŠˇÎ %%%sżĄ şÎŔűÇŐÇŃ Ŕ̸§ŔĚ ŔÖ˝Ŕ´Ď´Ů (%%undefine)\n"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "¸ĹĹŠˇÎ %%%s (%s)´Â ˇšş§ %d ŔĚÇĎżĄź­´Â ťçżëÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "%2$s(%3$s)żĄ žË źö žř´Â żÉźÇ %1$c(ŔĚ)°Ą ŔÖ˝Ŕ´Ď´Ů\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "šÝşš Č˝źö(%d)°Ą ĂÖ´ëÄĄ(%d) ş¸´Ů ĹŽ´Ď´Ů\n"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c(ŔĚ)°Ą ÁžˇáľÇÁö žĘŔ˝: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "'%%' ´ŮŔ˝żĄ Ăł¸ŽÇŇ źö žř´Â(unparseable) ¸ĹĹŠˇÎ°Ą ŔÖ˝Ŕ´Ď´Ů\n"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "¸ĹĹŠˇÎ %%%.*s¸Ś ĂŁŔť źö žř˝Ŕ´Ď´Ů, ťýˇŤÇŐ´Ď´Ů\n"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "¸ńÇĽ´ëťó(Target) šöĆŰ żŔšöÇáοě\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "%s ĆÄŔĎ: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "%s ĆÄŔĎŔĚ %u šŮŔĚĆŽ ş¸´Ů Ŕű˝Ŕ´Ď´Ů\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "źş°ř"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Ŕ߸řľČ ź­šö ŔŔ´äŔÔ´Ď´Ů"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr "ź­šö ŔÔ/ĂâˇÂ żŔˇůŔÔ´Ď´Ů"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "ź­šö ´ëąâ˝Ă°ŁŔĚ ĂĘ°úľÇžú˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "ź­šö ČŁ˝şĆŽ Á֟ҸŚ °ËťöÇŇ źö žř˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "ź­šö ČŁ˝şĆŽ Ŕ̸§Ŕť °ËťöÇŇ źö žř˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "ź­šöżĄ Á˘źÓÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "ź­šöżĄ ľĽŔĚĹÍ Á˘źÓŔť ˝ĂľľÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr "ˇÎÄĂ ĆÄŔĎżĄ ŔÔ/ĂâˇÂ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr ""
 "żř°Ý ź­šö¸Ś źöľż ¸đľĺ(passive mode)ˇÎ źłÁ¤ÇĎ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "ź­šöżĄź­ ĆÄŔĎŔť ĂŁŔť źö žř˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "ÁřÇŕŔĚ ÁߴܾǞú˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "žË źö žř´Â ȤŔş żšťóÄĄ ¸řÇŃ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "%sżĄ %s(Ŕ¸)ˇÎ ąâˇĎ(logging)ÇŐ´Ď´Ů, pw %s\n"
@@ -3744,6 +4091,7 @@ msgid "(no error)"
 msgstr "(żŔˇů žřŔ˝)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "ÄĄ¸íŔű żŔˇů: "
@@ -3763,94 +4111,61 @@ msgstr "°ć°í: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "¸Ţ¸đ¸Ž ÇŇ´ç °Ş (%u šŮŔĚĆŽ)ŔĚ NULLŔť šÝČŻÇĎż´˝Ŕ´Ď´Ů.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "°ć°í: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "°ć°í: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "°ć°í: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%sŔÇ ĆĐ˝şżöľĺ: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "żŔˇů: %s Ć÷ĆŽ´Â šÝľĺ˝Ă źýŔÚŔĚžîžß ÇŐ´Ď´Ů\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "URL Ć÷ĆŽ´Â šÝľĺ˝Ă źýŔÚŔĚžîžß ÇŐ´Ď´Ů\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s(Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
+#: tools/rpmcache.c:519
 #, fuzzy
-msgid "don't change directories"
-msgstr "%s ľđˇşĹ与¸Ś ťýźşÇŐ´Ď´Ů\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-#, fuzzy
-msgid "Common options for all rpm modes and executables:"
-msgstr "¸đľç rpm ¸đľĺżĄź­ŔÇ ŔĎšÝŔűŔÎ żÉźÇ:"
+msgid "File tree walk options:"
+msgstr "ź­¸í żÉźÇ:"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: żŠ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
@@ -3947,6 +4262,27 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "¸đľç rpm ¸đľĺżĄź­ŔÇ ŔĎšÝŔűŔÎ żÉźÇ:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "%d šř° Çŕ: ÇŘ´ç ĆÄŔϸíŔť ťçżëÇŇ źö žř˝Ŕ´Ď´Ů: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "ĆĐĹ°Áö źłÄĄ˝Ă ąâÁ¸żĄ źłÄĄľÇžî ŔÖ´Â ĆÄŔĎŔť ľ¤žîžš´Ď´Ů"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "%s(Ŕť)¸Ś ÁúŔÇÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "ŔĚŔü Çü˝ÄŔÇ źŇ˝ş ĆĐĹ°Áö´Â ÁúŔÇÇŇ źö žř˝Ŕ´Ď´Ů\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "ĆĐĹ°Áö°Ą žř˝Ŕ´Ď´Ů\n"
+
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "%s%s multilib °ćˇÎ¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
 
@@ -3987,10 +4323,6 @@ msgstr ""
 #~ msgid "Old (internal-only) signature!  How did you get that!?\n"
 #~ msgstr "ŔĚŔü (łťşÎ-żë) ź­¸í!  žîśť°Ô žňŔ¸źĚ˝Ŕ´Ďąî!?\n"
 
-#, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "%s: %s ˝şĹŠ¸łĆŽ¸Ś ˝ÇÇŕÇŐ´Ď´Ů (ŔÖŔť °ćżě)\n"
-
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr ""
diff --git a/po/no.po b/po/no.po
index 79d5d7bd4..ce6ee666d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -63,10 +63,12 @@ msgid "Building for target %s\n"
 msgstr "Bygger for mĺl %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "argumentet er ikke en RPM-pakke\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "feil under lesing av header fra pakke\n"
 
@@ -83,153 +85,157 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versjon %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright Š 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "kun ett střrre modi kan spesifiseres"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "én type spřrring/verifisering kan utfřres om gangen"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "uventede flagg for spřrring"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "ventet spřrringsformat"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "uventet spřrringskilde"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omplasseres under pakkeinstallasjon"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenter til --prefix mĺ begynne med en /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -237,7 +243,7 @@ msgstr ""
 "skript som slĺr av alternativer kan kun spesifiseres under pakkeinstallasjon "
 "og sletting"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -245,101 +251,106 @@ msgstr ""
 "alternativer som slĺr av utlřsing  kan kun spesifiseres under "
 "pakkeinstallasjon, og sletting"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "ingen filer ĺ signere\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan ikke aksessere fil %s\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp ikke funnet: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Skriv inn passord: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Passordsjekk feilet\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Passord er ok.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "kjřring feilet\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler oppgitt for ombygging"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "ingen spec-fil oppgitt for bygging"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "ingen tar-fil oppgitt for bygging"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "ingen argumenter oppgitt for spřrring"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "ingen argumenter oppgitt for verifisering"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for spřrring"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 
@@ -418,176 +429,176 @@ msgstr "&& og || ikke střttet for strenger\n"
 msgid "syntax error in expression\n"
 msgstr "syntaksfeil i uttrykk\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIDSJEKK feil: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Mangler '(' i %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Mangler ')' i %s(%s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ugyldig %s-tegn: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Mangler '(' i %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "To filer pĺ én linje: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Filen mĺ begynne med \"/\": %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan ikke blande spesiell %%doc med andre skjema: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fil listet to ganger: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolsk lenke peker til BuildRoot: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fil ikke funnet: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead feilet\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLead feilet\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linje %d: Filnavn ikke tillatt: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "Installerer %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig eier/gruppe: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "ingen pakke utlřser %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -641,7 +652,7 @@ msgstr "cpio_copy skriving feilet: %s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy: feil under lesing: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunne ikke ĺpne PreIn-fil: %s\n"
@@ -651,126 +662,126 @@ msgstr "Kunne ikke ĺpne PreIn-fil: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunne ikke ĺpne PreUn-fil: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunne ikke ĺpne PostIn-fil: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunne ikke ĺpne PostUn-fil: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunne ikke ĺpne VerifyScript-fil: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s er ikke en RPM-pakke\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: leser header fra %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke ĺpne %s: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke ĺpne sigmĺl %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -815,17 +826,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linje %d: Ugyldig flagg %s: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -845,123 +856,128 @@ msgstr "linje %d: Feil under lesing av %%filer: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr ""
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "%s-felt mĺ vćre tilstede i pakken: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Kunne ikke ĺpne ikon %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Kan ikke lese ikon %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Ukjent ikontype: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "linje %d: Tagg tar kun et enkelt tegn: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linje %d: Feilutformet tagg: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linje %d: Tom tagg: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "linje %d: Ugyldig tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot kan ikke vćre \"/\": %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "linje %d: Prefiks mĺ ikke slutte pĺ \"/\": %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linje %d: Docdir mĺ begynne med '/': %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "linje %d: Epoch/serienummer mĺ vćre et tall: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linje %d: Ugyldig %s: kvalifikatorer: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linje %d: Ugyldig BuildArchitecture format: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern feil: Ugyldig tag %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ugyldig pakkespesifikasjon: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakke eksisterer allerede: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linje %d: Ukjent tagg: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec-fil kan ikke bruke BuildRoot\n"
 
@@ -1042,82 +1058,87 @@ msgstr ""
 "linje %d: Avhengighetstegn mĺ begynne med alfanumerisk tegn, '_' eller '/': %"
 "s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "linje %d: Filnavn ikke tillatt: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "linje %d: Filnavn med versjon ikke tillatt: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "linje %d: Versjon kreves: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "linje %d: triggere mĺ ha --: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "linje %d: Feil under lesing av %s: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "linje %d: skriptprogram mĺ begynne med '/': %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "linje %d: skriptprogram mĺ begynne med '/': %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "linje %d: Andre %s\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "linje %d: Feilutformet tagg: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "linje %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Kan ikke ĺpne %s: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Ĺpen %%if\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerer %d\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else uten %%if\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif uten %%if\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "ugyldig %%include utsagn\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen kompatible arkitekturer funnet for bygging\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakken har ingen %%description: %s\n"
@@ -1245,20 +1266,20 @@ msgstr "ikke verifiser pakkeavhengigheter"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "ikke verifiser pakkearkitektur"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verifiser pakkesignatur"
@@ -1357,79 +1378,90 @@ msgstr ""
 msgid " failed - "
 msgstr " feilet - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "pakke %s er allerede installert"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakke %s er allerede installert"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "ingen pakker\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr ""
 
@@ -1441,7 +1473,7 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr ""
 
@@ -1449,7 +1481,7 @@ msgstr ""
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "hopp over PGP-signaturer"
@@ -1469,7 +1501,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr "feil under kjřring av stat pĺ %s: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "klarte ikke ĺ ĺpne %s: %s\n"
@@ -1543,262 +1575,303 @@ msgstr "%s unlink av %s feilet: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s opprettet som %s\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, c-format
+msgid "adding %d args from manifest.\n"
+msgstr ""
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke opprette %%%s %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "feil under oppretting av midlertidig fil %s\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature feilet\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tilgjengelig\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead feilet\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread feilet: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr ""
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "skriv ut makroutvidelsen av <uttr>+"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "les <fil:...> i stedet for standard makrofil(er)"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "slĺ av bruk av libio(3) API"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "send stdout til <kmd>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "bruk <katalog> som toppnivĺkatalog"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "vis kjente tagger for spřrring"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "vis endelig rpmrc og makrokonfigurasjon"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "gi mindre detaljert info"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "gi mer detaljert info"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "skriv ut hvilken versjon av rpm som brukes"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "feilsřking pĺ protokoll-datastrřm"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "feilsřk rpmio I/U"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "feilsřk URL-cache hĺndtering"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "eksluderingssti mĺ begynne med en /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "relokasjoner mĺ begynne med en /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "relokasjoner mĺ inneholde et ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "relokasjoner mĺ ha et / etter ="
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "spřr/verifiser pakke(r) i gruppe"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "installer alle filer, selv konfigurasjoner som ellers kan hoppes over"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1806,155 +1879,164 @@ msgstr ""
 "fjern alle pakker som er lik <pakke> (normalt vil en feil genereres hvis "
 "<pakke> spesifiserer flere pakker)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "ikke kjřr pakkespesifikke skriptlet"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "omplasser filer i ikke-omplasserbar pakke"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr "lagre slettede pakkefiler ved ĺ endre navn til underkatalog"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "slett (avinstaller) pakke"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<pakke>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "ikke installer dokumentasjon"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "ikke installer dokumentasjon"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "hopp over filer med innledende komponent <sti> "
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<sti>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "omplasser filer i ikke-omplasserbar pakke"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "forkortning for --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "oppgrader pakke(r) hvis allerede installert"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<pakkefil>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "skriv ut skigarder etter som pakken installeres (nyttig med -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "ikke verifiser pakkearkitektur"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "ikke verifiser operativsystem for pakken"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "ikke sjekk diskplass fřr installasjon"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "installer dokumentasjon"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "installer pakke"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "oppdater databasen, men ikke modifiser filsystemet"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "ikke installer dokumentasjon"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ikke ordne pakkeinstallasjon for ĺ tilfredsstille avhengigheter"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "ikke kjřr noen %%pre skriptlet (hvis noen)"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "ikke kjřr %%post skriptlet (hvis noen)"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "ikke kjřr %%preun skriptlet (hvis noen)"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "ikke kjřr %%postun skriptlet (hvis noen)"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "Ikke kjřr noen skriptlets som utlřses av denne pakken"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "ikke kjřr %%triggerprein skriptlets"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "ikke kjřr %%triggerin skriptlets"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "ikke kjřr %%triggerun skriplets"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "ikke kjřr %%triggerpostun skriptlets"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1962,474 +2044,491 @@ msgstr ""
 "oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjřr "
 "dette automatisk)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<kat>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "omplasser filer fra sti <gml> til <ny>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<gml>=<ny>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr "lagre slettede pakkefiler ved ompakking"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "installer selv om pakken erstatter installerte filer"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "reinstaller selv om pakken allerede er installert"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 #, fuzzy
 msgid "<date>"
 msgstr "<sti>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "ikke installer, men si ifra om det ville virke eller ikke"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "oppgrader pakke(r)"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "spřr/verifiser alle pakker"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "rpm spřrremodus"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "spřr/verifiser pakke(r) som eier fil"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
+msgid "query/verify package(s) in group"
+msgstr "spřr/verifiser pakke(r) i gruppe"
+
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "spřr/verifiser pakke(r) som eier fil"
+msgid "query/verify a package file"
+msgstr "spřr/verifiser alle pakker"
 
-#: lib/poptQV.c:103
-msgid "query/verify package(s) in group"
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "spřr/verifiser pakke(r) i gruppe"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "spřr/verifiser pakke(r) i gruppe"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "spřr/verifiser pakke(r) som eier fil"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "spřr/verifiser alle pakker"
+msgid "query/verify package(s) with header identifier"
+msgstr "spřr/verifiser pakke(r) som eier fil"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "spřr/verifiser pakke(r) som eier fil"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "rpm spřrremodus"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "spřr/verifiser pakke(r) som eier fil"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "spřrring pĺ spec-fil"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "spřr/verifiser pakke(r) i gruppe"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "spřr pakker utlřst av <pakke>"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "spřr etter etter pakker som trenger <funk> funksjonalitet"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "spřr etter pakker som tilbyr <funk> funksjonalitet"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "ingen argumenter oppgitt for spřrring"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "Ugyldig/ulesbar header"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "ikke verifiser střrrelse pĺ filer"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "ikke verifiser sti til symbolske lenker for filer"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "ikke verifiser eier av filer"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "ikke verifiser gruppe for filer"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "ikke verifisert endringsdato for filer"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "ikke verifiser modus for filer"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "ikke verifiser filer i pakke"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "ikke verifiser filer i pakke"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "ikke kjřr %verifyscript (hvis noen)"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ikke verifiser header SHA1 digest"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "signer en pakke (forkast nĺvćrende signatur)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verifiser pakkesignatur"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signer en pakke (forkast nĺvćrende signatur)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "generer signatur"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binćr funnet\n"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: kjřrer %s-skript (hvis noen)\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke ĺ ĺpne %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ukorrekt format: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(inneholder ingen filer)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "erstattet     "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "ikke installert"
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "delt via nett "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(ingen tilstand)"
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ukjent %3d)  "
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "pakken har verken fileier eller id-lister\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "pakken har verken fileier eller id-lister\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "feil under ĺpning av %s: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "spřrring pĺ %s feilet\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "kildepakker i gammelt format kan ikke spřrres\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "ingen pakke utlřser %s\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "ingen pakker\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "linje %d: Ukjent tagg: %s\n"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s inneholder ingen pakker\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakke utlřser %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "ingen pakke utlřser %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakke krever %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakke gir %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s eies ikke av noen pakke\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2526,28 +2625,28 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr "NEI"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr "JA"
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
@@ -2557,158 +2656,187 @@ msgstr "pakke %s er i konflikt: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omplasser %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "relokerer %s til %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "relokerer katalog %s til %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "feil under ĺpning av %s: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "linje %d: Ukjent tagg: %s\n"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "feilede avhengigheter:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 #, fuzzy
 msgid "Repackaging..."
 msgstr "Forbereder..."
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 #, fuzzy
 msgid "Upgrading..."
 msgstr "Forbereder..."
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "oppgrader pakke(r)"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Henter %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hopper over %s - overfřring feilet - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<kildepakke>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "installerer binćrpakker\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "feil under lesing fra fil %s\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "fil %s trenger en nyere versjon av RPM\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "ingen pakke utlřser %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d binćrpakker\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "feilede avhengigheter:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "installerer binćrpakker\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spesifiserer flere pakker\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke ĺpne %s: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "Henter %s\n"
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2723,7 +2851,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2750,6 +2878,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- ikke střttet for strenger\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2825,175 +2958,230 @@ msgstr " er i konflikt med %s-%s-%s\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "mangler andre ':' ved %s:%d\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manglende navn pĺ arkitektur ved %s:%d\n"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ukomplett datalinje ved %s:%d\n"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "For mange argumenter i datalinje ved %s:%d\n"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ukomplett standardlinje ved %s:%d\n"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "mangler ':' (fant 0x%02X) ved %s:%d\n"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manglende argumentfor %s ved %s:%d\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan ikke ĺpne %s ved %s:%d %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manglende arkitektur for %s ved %s:%d\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ugyldig flagg '%s' ved %s:%d\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan ikke utvide %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan ikke ĺpne pakkedatabase i %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Mangler '(' i %s %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "kan ikke ĺpne database i %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Henter %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "henter liste over monterte filsystemer\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "relokerer %s til %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3010,6 +3198,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3034,6 +3223,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3101,6 +3291,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3125,43 +3318,166 @@ msgstr "For stor header"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "ikke verifiser header SHA1 digest"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "hopp over MD5-signaturer"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer katalog %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "kildepakke forventet, binćr funnet\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "ingen pakke utlřser %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<kildepakke>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<kildepakke>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "feil under lesing av header fra pakke\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3170,11 +3486,15 @@ msgstr "ekskluderer katalog %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3183,7 +3503,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3191,13 +3511,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "mangler    %s"
 
 #: lib/verify.c:437
@@ -3230,135 +3574,135 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "mangler { etter %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "mangler } etter %{"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr ""
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr ""
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr ""
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3383,324 +3727,324 @@ msgstr ""
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan ikke ĺpne %s-indeks ved bruk av db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan ikke ĺpne %s indeks\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "Overflyt i mĺlbuffer\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Fil %s er mindre enn %u bytes\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3710,6 +4054,7 @@ msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "fatal feil: "
@@ -3729,92 +4074,60 @@ msgstr "advarsel: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, fuzzy, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "advarseo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Passord for %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "feil: %s-port mĺ vćre et tall\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "url-port mĺ vćre et tall\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "verifiser pakkesignatur"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-msgid "don't change directories"
-msgstr ""
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr ""
-
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ĺpne feilet: %s\n"
@@ -3911,6 +4224,24 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "linje %d: Filnavn ikke tillatt: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "installer selv om pakken erstatter installerte filer"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "spřrring pĺ %s feilet\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "kildepakker i gammelt format kan ikke spřrres\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "ingen pakker\n"
+
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "ekskluderer multilib-sti %s%s\n"
 
@@ -3937,10 +4268,6 @@ msgstr ""
 #~ msgstr "kunne ikke skrive alle data til %s\n"
 
 #, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "%s: kjřrer %s-skript (hvis noen)\n"
-
-#, fuzzy
 #~ msgid "%s: base64 encode failed.\n"
 #~ msgstr "%s: readLead feilet\n"
 
diff --git a/po/pl.po b/po/pl.po
index 2fab9b75b..49881cd8b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.3-20030515\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-20 21:12+0200\n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 2003-06-08 22:42+0200\n"
 "Last-Translator: Arkadiusz Miskiewicz <arekm@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -92,43 +92,52 @@ msgstr "Opcje zapytania (z -q lub --query):"
 msgid "Verify options (with -V or --verify):"
 msgstr "Opcje weryfikacji (z -V lub --verify):"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "Opcje weryfikacji (z -V lub --verify):"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "Opcje dotyczące sygnatur:"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "Opcje dotyczące bazy danych:"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Opcje budowania z [ <plik spec> | <tarball> | <pakiet źródłowy> ]:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opcje instalowania/uaktualniania/usuwania:"
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
-msgstr "Wspólne opcje dla wszystkich trybów rpm-a:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
+msgstr "Wspólne opcje dla wszystkich trybów i binarek rpm-a:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM wersja %s\n"
 
-#: rpmqv.c:136
+#: rpmqv.c:144
 #, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 
-#: rpmqv.c:137
+#: rpmqv.c:145
 #, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
@@ -136,111 +145,107 @@ msgstr ""
 "Ten program może być swobodnie rozpowszechniany na warunkach licencji GNU "
 "GPL\n"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Błąd wewnętrzny w przetwarzaniu argumentu (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "tylko jeden główny tryb pracy może być podany"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "tylko jeden typ odpytywania/sprawdzania można wykonać na raz"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "błędne flagi zapytania"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "błędny format zapytania"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "błędne odniesienie zapytania"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "tylko instalację, uaktualnienie i usuwanie źródeł można wymusić"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "przesuwania plików można dokonać tylko w trakcie instalacji"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "nie można użyć --prefix z --relocate lub --excludepath"
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate i --excludepath można użyć tylko w trakcie instalacji nowych "
 "pakietów"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix można użyć tylko w trakcie instalacji nowych pakietów"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty dla --prefix muszą się rozpoczynać od /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles można użyć tylko w trakcie instalacji pakietów"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "nie można jednocześnie użyć --excludedocs i --includedocs"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches można użyć tylko w trakcie usuwania pakietów"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb można użyć tylko w trakcie instalacji lub usuwania pakietów"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -248,7 +253,7 @@ msgstr ""
 "opcje wyłączające skrypty mogą być podane tylko przy instalacji lub usuwaniu "
 "pakietów"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -256,7 +261,7 @@ msgstr ""
 "opcje wyłączające triggery mogą być podane tylko przy instalacji lub "
 "usuwaniu pakietów"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -264,14 +269,14 @@ msgstr ""
 "--nodeps można użyć tylko w trakcie budowania, przebudowywania, "
 "rekompilacji, instalacji, usuwania lub sprawdzania pakietów"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test można użyć tylko w trakcie instalacji, usuwania lub budowania pakietów"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -279,82 +284,82 @@ msgstr ""
 "--root (-r) można użyć tylko w trakcie instalacji, usuwania, sprawdzania "
 "pakietów lub przebudowywania bazy"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty dla --root (-r) muszą się rozpoczynać od /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
 #, c-format
 msgid "no files to sign\n"
 msgstr "brak plików do podpisania\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "brak dostępu do pliku %s\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
 #, c-format
 msgid "pgp not found: "
 msgstr "nie znaleziono pgp: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Podaj hasło: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Weryfikacja hasła nieudana\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Hasło jest prawidłowe.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Błędny %%_signature spec w pliku makra.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign można użyć tylko w trakcie budowania pakietu"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
 #, c-format
 msgid "exec failed\n"
 msgstr "wykonanie nie powiodło się\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakietów do przebudowania"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "nie podano nazw plików spec do budowania"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "nie podano nazw plików tar do budowania"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr "nie podano nazw pakietów do usunięcia"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "nie podano argumentów dla trybu zapytań"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "nie podano argumentów dla sprawdzania"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr "nie podano argumentów"
 
@@ -437,169 +442,169 @@ msgstr "&& i || nie są obsługiwane dla łańcuchów znakowych\n"
 msgid "syntax error in expression\n"
 msgstr "błąd składni w wyrażeniu\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK nie powiodło się: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Brak '(' w %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Brak ')' w %s(%s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Błędny znak %s: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Brak %s w %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Brak białego znaku po %s(): %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Błędna składnia: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Błędne określenie uprawnień: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Błędne określenie uprawnień katalogu: %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Niespotykana długość określenia lokalizacji \"%.*s\" w %%lang(%s)\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Powtórzone określenie lokalizacji %.*s w %%lang(%s)\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Limit trafień dla %%docdir\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Tylko jeden argument dla %%docdir\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dwa pliki w jednej linii: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Plik musi się zaczynać od \"/\": %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie można mieszać specjalnego %%doc z innymi formami: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Plik podany dwukrotnie: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Dowiązanie symboliczne wskazuje na BuildRoot: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Plik nie zgadza się z prefiksem (%s): %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Nie znaleziono pliku: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: nie można załadować nieznanego tagu (%d).\n"
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: odczyt klucza publicznego nie powiódł się.\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: nie jest opakowanym kluczem publicznym.\n"
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: odczyt polityki *.te nie powiódł się.\n"
 
-#: build/files.c:1843
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Plik musi się zaczynać od \"/\": %s\n"
 
-#: build/files.c:1867
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob niedozwolony: %s\n"
 
-#: build/files.c:1884 lib/rpminstall.c:362
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Nie znaleziono pliku poprzez glob: %s\n"
 
-#: build/files.c:1944
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nie można otworzyć pliku %s dla %%files: %s\n"
 
-#: build/files.c:1955 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "linia: %s\n"
 
-#: build/files.c:2351
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Błędny plik: %s: %s\n"
 
-#: build/files.c:2363 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Błędny użytkownik/grupa: %s\n"
 
-#: build/files.c:2407
+#: build/files.c:2418
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Szukanie niespakietowanych plików: %s\n"
 
-#: build/files.c:2430
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -608,7 +613,7 @@ msgstr ""
 "Znaleziono zainstalowane (ale niespakietowane) pliki:\n"
 "%s"
 
-#: build/files.c:2458
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Przetwarzanie plików: %s-%s-%s\n"
@@ -747,7 +752,7 @@ msgstr "Nie można ponownie odczytać nagłówka sygnatury.\n"
 msgid "Could not open %s: %s\n"
 msgstr "Nie można otworzyć %s: %s\n"
 
-#: build/pack.c:646 lib/psm.c:1665
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie można zapisać pakietu: %s\n"
@@ -777,7 +782,7 @@ msgstr "Nie można odczytać danych z %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie można zapisać danych do %s: %s\n"
 
-#: build/pack.c:739 lib/psm.c:1934
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -862,123 +867,128 @@ msgstr "linia %d: Błąd w interpretacji %%files: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "linia %d: Druga lista %%files\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architektura jest wykluczona: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architektura nie jest wspierana: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS jest wykluczony: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS nie jest wspierany: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "pole %s musi być obecne w pakiecie: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Podwójne wpisy %s w pakiecie: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Nie można otworzyć ikony %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Nie można odczytać ikony %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Nieznany typ ikony: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "linia %d: Etykieta przyjmuje tylko jeden znacznik: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linia %d: Niepoprawna forma etykiety: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linia %d: Pusta etykieta: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "linia %d: Nielegalny znak '-' w %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:466
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot nie może być \"/\": %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "linia %d: Prefiksy nie mogą się kończyć na \"/\": %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linia %d: Docdir musi się zaczynać od '/': %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "linia %d: pole Epoch/Serial musi być liczbą: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linia %d: Błędne określenie %s: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linia %d: Błędny format BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Błąd wewnętrzny: Fałszywa etykieta %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Błędna specyfikacja pakietu: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakiet już istnieje: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linia %d: Nieznana etykieta: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Plik spec nie może używać BuildRoot\n"
 
@@ -1059,17 +1069,12 @@ msgstr ""
 "linia %d: Oznaczenia zależności muszą się zaczynać od alfanumerycznych, '_' "
 "lub '/': %s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "linia %d: Nazwa pliku niedozwolona: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "linia %d: Wersja w nazwie pliku niedozwolona: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "linia %d: Wymagana wersja: %s\n"
@@ -1104,47 +1109,47 @@ msgstr "linia %d: Drugi %s\n"
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "linia %d: nieobsługiwany wewnętrzny skrypt: %s\n"
 
-#: build/parseSpec.c:195
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "linia %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:247
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nie można otworzyć %s: %s\n"
 
-#: build/parseSpec.c:263
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Niedomknięte %%if\n"
 
-#: build/parseSpec.c:340
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean zwróciło %d\n"
 
-#: build/parseSpec.c:349
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Napotkano %%else bez %%if\n"
 
-#: build/parseSpec.c:361
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Napotkano %%endif bez %%if\n"
 
-#: build/parseSpec.c:375 build/parseSpec.c:384
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "błędnie sformułowany wpis %%include\n"
 
-#: build/parseSpec.c:587
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "Nie znaleziono kompatybilnych architektur do budowania\n"
 
-#: build/parseSpec.c:648
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakiet nie ma %%description: %s\n"
@@ -1271,18 +1276,18 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "generuj nagłówki pakietu kompatybilne z (wymierającymi) pakietami rpm[23]"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 msgid "don't verify package digest(s)"
 msgstr "nie sprawdzaj skrótów pakietu"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 msgid "don't verify database header(s) when retrieved"
 msgstr "nie sprawdzaj nagłówków bazy danych przy odczycie"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 msgid "don't verify package signature(s)"
 msgstr "nie sprawdzaj sygnatur pakietu"
 
@@ -1380,52 +1385,63 @@ msgstr "Brak pliku archiwum w nagłówku"
 msgid " failed - "
 msgstr " nie powiodło się -"
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "pakiet %s był już dodany, jest zastępowany przez %s\n"
+
+#: lib/depends.c:219
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakiet %s był już dodany, jest zastępowany przez %s\n"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr "(zbuforowane)"
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr "(zasób rpmrc)"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr "(zasób rpmliba)"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr "(pliki w bazie)"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr "(zasób w bazie)"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 msgid "(db package)"
 msgstr "(pakiet w bazie)"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignoruj relacje nazw pakietów [%d]\t%s -> %s\n"
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "usuwanie %s \"%s\" z relacji tsort.\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "========== zapisywanie relacji tsort\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
@@ -1433,27 +1449,27 @@ msgstr ""
 "========== tsortowanie pakietów (kolejność, #poprzedniki, #następniki, "
 "drzewo, głębokość)\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== tylko następniki (%d bajtów)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "PĘTLA:\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== kontynuowanie tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder nie powiodło się, zostało %d elementów\n"
 
 #: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
-#: rpmdb/header.c:3540 rpmdb/header.c:3569 rpmdb/header.c:3593
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(nie jest liczbą)"
 
@@ -1566,6 +1582,11 @@ msgstr "%s unlink %s nie powiodło się: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s utworzony jako %s\n"
 
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "dodawanie %d wpisów do indeksu %s.\n"
+
 #: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
@@ -1581,248 +1602,288 @@ msgstr "nie można zapisać do %%%s %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "błąd przy tworzeniu pliku tymczasowego %s\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "rozmiar bloba(%d): BŁĘDNY, 8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "etykieta[%d]: BŁĘDNA, etykieta %d typ %d offset %d licznik %d\n"
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr "offset obszaru: BŁĘDNY, etykieta %d typ %d offset %d licznik %d\n"
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr "końcówka obszaru: BŁĘDNA, etykieta %d typ %d offset %d licznik %d\n"
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "rozmiar obszaru: BŁĘDNY, ril(%d) > il(%d)\n"
 
-#: lib/package.c:453
+#: lib/package.c:455
 #, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr "hdr SHA1: BŁĘDNY, nie szesnastkowy\n"
 
-#: lib/package.c:471
+#: lib/package.c:473
 #, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr "hdr DSA: BŁĘDNY, nie binarny\n"
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr "tylko sygnatury V3 mogą być sprawdzone, sygnatura V%u jest pomijana\n"
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr "hdr rozmiar(%d): BŁĘDNY, read zwróciło %d\n"
 
-#: lib/package.c:665
+#: lib/package.c:672
 #, c-format
 msgid "hdr magic: BAD\n"
 msgstr "hdr magic: BŁĘDNY\n"
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr "hdr etykiety: BŁĘDNE, liczba etykiet(%d) spoza zakresu\n"
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr "hdr dane: BŁĘDNE, liczba bajtów(%d) spoza zakresu\n"
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr "hdr blob(%d): BŁĘDNY, read zwróciło %d\n"
 
-#: lib/package.c:709
+#: lib/package.c:716
 #, c-format
 msgid "hdr load: BAD\n"
 msgstr "hdr load: BŁĘDNY\n"
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "pakiety w wersji 1 nie są obsługiwane przez tę wersję RPM-a\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "tylko pakiety z numerem głównym <= 4 są obsługiwane przez tę wersję RPM-a\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature nie powiodło się: %s"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Sygnatura nie jest dostępna\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead nie powiodło się: %s"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread nie powiodło się: %s\n"
 
+#: lib/poptALL.c:225
+#, fuzzy
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr "podążaj za dowiązaniami z linii poleceń"
+
 #: lib/poptALL.c:227
+#, fuzzy
+msgid "FTS_LOGICAL: logical walk"
+msgstr "przechodź logicznie"
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "nie zmieniaj katalogów"
+
+#: lib/poptALL.c:231
+#, fuzzy
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr "nie odczytuj informacji stat"
+
+#: lib/poptALL.c:233
+#, fuzzy
+msgid "FTS_PHYSICAL: physical walk"
+msgstr "przechodź fizycznie"
+
+#: lib/poptALL.c:235
+#, fuzzy
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr "zwracaj kropkę i kropkę-kropkę"
+
+#: lib/poptALL.c:237
+#, fuzzy
+msgid "FTS_XDEV: don't cross devices"
+msgstr "nie przechodź między urządzeniami"
+
+#: lib/poptALL.c:239
+#, fuzzy
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr "zwróć informacje o whiteout"
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr "predefiniuj MAKRO z wartością WYR"
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr "'MAKRO WYR'"
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr "definiuj MAKRO z wartością WYR"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 msgid "print macro expansion of EXPR"
 msgstr "wyświetl rozwinięcie makr z WYR"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr "'WYR'"
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "czytaj <PLIK:...> zamiast domyślnego pliku(ów)"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr "<PLIK:...>"
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "wyłącz używanie API libio(3)"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 msgid "send stdout to CMD"
 msgstr "przekaż standardowe wyjście do POLECENIA"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr "POLECENIE"
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 msgid "use ROOT as top level directory"
 msgstr "użyj KAGALOGu jako katalogu najwyższego poziomu"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr "KATALOG"
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "wyświetl znane etykiety zapytań"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "wyświetl ostateczną konfigurację rpmrc i makr"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "używaj mniej szczegółowego wyjścia"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "używaj bardziej szczegółowego wyjścia"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "wyświetl wersję używanego rpm-a"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr "śledź maszynę stanu danych pliku"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 msgid "use threads for file state machine"
 msgstr "użyj wątków dla maszyny stanu plików"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "śledź strumień danych protokołu"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr "śledź przetwarzanie opcji/argumentów"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr "śledź maszynę stanu pakietu"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 msgid "use threads for package state machine"
 msgstr "użyj wątków dla maszyny stanu pakietów"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "śledź wejście/wyjście rpmio"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "śledź obsługę buforowania URL-i"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabela opcji błędnie skonfigurowana (%d)\n"
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "ścieżki wyłączeń muszą się zaczynać od /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "specyfikacja przesunięcia musi zaczynać się od /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "specyfikacja przesunięcia musi zawierać ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "specyfikacja przesunięcia musi zawierać / po ="
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr "cofnięcie przyjmuje argument w postaci znacznika czasu/daty"
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr "błędny argument znacznika czasu/daty dla cofnięcie"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 msgid "add suggested packages to transaction"
 msgstr "dodaj sugerowane pakiety do transakcji"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaluj wszystkie pliki, nawet konfiguracyjne, które w innym przypadku by "
 "pominięto"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1830,151 +1891,160 @@ msgstr ""
 "usuń wszystkie pakiety, które spełniają wzorzec <pakiet> (zazwyczaj "
 "wyświetlany jest błąd gdy <pakiet> opisuje wiele pakietów)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr "użyj porządku wyświetlania anacondy"
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów instalacyjnych"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 msgid "relocate files in non-relocatable package"
 msgstr "przesuwanie plików w nieprzesuwalnym pakiecie"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr "zapisz usuwane pliki z pakietu przenosząc do podkatalogu"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "usuń (odinstaluj) pakiet"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<pakiet>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 msgid "do not install configuration files"
 msgstr "nie instaluj plików konfiguracyjnych"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "nie instaluj dokumentacji"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "pomiń pliki zaczynające się od <ścieżki> "
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<ścieżka>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "przesuwanie plików w nieprzesuwalnym pakiecie"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "uaktualnij pakiet(y) jeśli jest już zainstalowany"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<plik pakietu>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "wyświetlaj znaki hash przy instalacji (dobre z -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "nie sprawdzaj architektury systemu"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "nie sprawdzaj rodzaju systemu operacyjnego"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "nie sprawdzaj zajętości dysku przed instalacją"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "zainstaluj dokumentację"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 msgid "install package(s)"
 msgstr "instaluj pakiet(y)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "uaktualnij bazę, ale nie modyfikuj systemu plików"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "nie sprawdzaj zależności pakietu"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "nie sprawdzaj skrótów MD5 plików"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 msgid "don't install file security contexts"
 msgstr "nie instaluj plików z kontekstami bezpieczeństwa"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nie zmieniaj kolejności instalacji pakietów by zapewnić zależności"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "nie sugeruj sposobu(ów) spełnienia brakujących zależności"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nie wykonuj skryptu %%pre (jeśli jest)"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nie wykonuj skryptu %%post (jeśli jest)"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nie wykonuj skryptu %%preun (jeśli jest)"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nie wykonuj skryptu %%postun (jeśli jest)"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "nie wykonuj żadnych triggerów uaktywnianych przez ten pakiet"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów %%triggerprein"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów %%triggerin"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów %%triggerun"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów %%triggerpostun"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1982,230 +2052,262 @@ msgstr ""
 "uaktualnij do starej wersji (--force robi to samo automatycznie podczas "
 "uaktualniania)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "wyświetlaj stan instalacji w procentach"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "przesuń pliki pakietu do drzewa <katalog>, jeśli jest przesuwalny"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<katalog>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "przesuń pliki z drzewa <stara-ścieżka> do drzewa <nowa-ścieżka>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<stara-ścieżka>=<nowa-ścieżka>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr "zapisz usuwane pliki z pakietu poprzez przepakowanie"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "instaluj nawet gdy pakiet zastępuje inne zainstalowane pliki"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "przeinstaluj jeśli pakiet jest już zainstalowany"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "odinstaluj nowe, zainstaluj z powrotem stare pakiety aż do <daty>"
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr "<data>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "nie instaluj, podaj tylko czy instalacja zadziała czy nie"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "uaktualnij pakiet(y)"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "odpytaj/sprawdź wszystkie pakiety"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 msgid "rpm checksig mode"
 msgstr "tryb sprawdzania sygnatur"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "odpytaj/sprawdź pakiet(y) zawierające plik"
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
-msgstr "odpytaj/sprawdź pakiet(y) z identyfikatorem pliku"
-
-#: lib/poptQV.c:103
+#: lib/poptQV.c:108
 msgid "query/verify package(s) in group"
 msgstr "odpytaj/sprawdź pakiet(y) w grupie"
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
-msgstr "odpytaj/sprawdź pakiet(y) z identyfikatorem nagłówka"
-
-#: lib/poptQV.c:107
+#: lib/poptQV.c:110
 msgid "query/verify a package file"
 msgstr "odpytaj/sprawdź plik pakietu"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
+msgstr "odpytaj/sprawdź pakiety z transakcji instalacji"
+
+#: lib/poptQV.c:115
+#, fuzzy
+msgid "query/verify package(s) from system HDLIST"
+msgstr "odpytaj/sprawdź pakiety z transakcji instalacji"
+
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr "odpytaj/sprawdź pakiet(y) z identyfikatorem pakietu"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr "odpytaj/sprawdź pakiet(y) z identyfikatorem nagłówka"
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr "odpytaj/sprawdź pakiet(y) z identyfikatorem pliku"
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "tryb odpytywania"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 msgid "query/verify a header instance"
 msgstr "odpytaj/sprawdź instancję nagłówka"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "odpytywanie pliku spec"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<spec>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr "odpytaj/sprawdź pakiety z transakcji instalacji"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "odpytaj pakiety z triggerami uaktywnianymi przez pakiet"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "tryb sprawdzania"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "odpytaj/sprawdź pakiet(y) wymagające zasobu"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "odpytaj/sprawdź pakiet(y) udostępniające zasób"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "nie podano argumentów"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: nie można odczytać nagłówka pod 0x%x\n"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "wyświetl wszystkie pliki konfiguracyjne"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "wyświetl wszystkie pliki dokumentacji"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "podaj podstawowe informacje o pliku"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "wyświetl pliki zawarte w pakiecie"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr "pomiń pliki %%ghost"
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr "pomiń pliki %%license"
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr "pomiń pliki %%readme"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "użyj następującego formatu zapytania"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "zamień sekcje i18n w plik spec"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "wyświetl status pokazywanych plików"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "nie sprawdzaj rozmiaru plików"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "nie sprawdzaj ścieżek dowiązań plików"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "nie sprawdzaj właścicieli plików"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "nie sprawdzaj grup plików"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "nie sprawdzaj czasu modyfikacji plików"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "nie sprawdzaj uprawnień plików"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 msgid "don't verify file security contexts"
 msgstr "nie sprawdzaj kontekstów bezpieczeństwa plików"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "nie sprawdzaj zależności pakietu"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 msgid "don't execute verify script(s)"
 msgstr "nie wykonuj żadnych skryptów verify"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "nie sprawdzaj sygnatur GPG V3 DSS"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "nie sprawdzaj sygnatur PGP V3 RSA/MD5"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 msgid "sign package(s) (identical to --resign)"
 msgstr "podpisz pakiet(y) (identyczne z --resign)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 msgid "verify package signature(s)"
 msgstr "sprawdź sygnaturę pakietu"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr "importuj opakowany klucz publiczny"
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podpisz pakiet(y) (identyczne z --addsign)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "generuj sygnaturę"
 
@@ -2236,216 +2338,191 @@ msgstr ""
 "setexeccon(%s) nie powiodło się z kontekstu \"%s\": %s\n"
 "Kontynuję ...\n"
 
-#: lib/psm.c:733
-#, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: %s(%s-%s-%s) %ssynchroniczny start skryptu\n"
+
+#: lib/psm.c:736
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s) pomijanie nadmiarowego \"%s\".\n"
 
-#: lib/psm.c:741
-#, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+#: lib/psm.c:744
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s) %ssynchroniczny start skryptu\n"
 
-#: lib/psm.c:920
-#, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+#: lib/psm.c:956
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:953
-#, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+#: lib/psm.c:990
+#, fuzzy, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "skrypt %s(%s-%s-%s) nie powiódł się, waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:959
-#, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+#: lib/psm.c:996
+#, fuzzy, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "skrypt %s(%s-%s-%s) nie powiódł się, status wyjścia %d\n"
 
-#: lib/psm.c:1391
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s ma %d plików, test = %d\n"
 
-#: lib/psm.c:1568
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: skrypt %s nie powiódł się (%d), pomijanie %s\n"
 
-#: lib/psm.c:1677
+#: lib/psm.c:1715
 msgid "Unable to reload signature header\n"
 msgstr "Nie można ponownie odczytać nagłówka sygnatury\n"
 
-#: lib/psm.c:1755
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozpakowanie archiwum nie powiodło się%s%s: %s\n"
 
-#: lib/psm.c:1756
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:1942
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s nie powiódł się na pliku %s: %s\n"
 
-#: lib/psm.c:1945
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiodło się: %s\n"
 
-#: lib/psm.c:2128
-#, c-format
-msgid "Attempting to mark %s as installed in score board(%p).\n"
+#: lib/psm.c:2168
+#, fuzzy, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
 msgstr "Próba oznakowania %s jako zainstalowanego w tablicy punktów(%p).\n"
 
-#: lib/psm.c:2161
+#: lib/psm.c:2201
 #, c-format
 msgid "Attempting to mark %s as erased in score board(0x%x).\n"
 msgstr "Próba oznakowania %s jako usuniętego w tablicy punktów(0x%x).\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "błędny format: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(nie zawiera plików)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normalny      "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "zastąpiony    "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "niezainstalowany"
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "udostępniony w sieci"
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr "zły kolor     "
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(brak statusu)"
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(nieznany %3d)"
 
-#: lib/query.c:266
+#: lib/query.c:271
 msgid "package has not file owner/group lists\n"
 msgstr "pakiet nie ma list właścicieli/grup plików\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "pakiet nie ma list właścicieli ani id plików\n"
 
-#: lib/query.c:430 lib/query.c:477 lib/rpminstall.c:124 lib/rpminstall.c:477
-#: lib/rpminstall.c:608 lib/rpminstall.c:1033 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "otwarcie %s nie powiodło się: %s\n"
-
-#: lib/query.c:445
-#, c-format
-msgid "query of %s failed\n"
-msgstr "odpytywanie %s nie powiodło się\n"
-
-#: lib/query.c:455
-msgid "old format source packages cannot be queried\n"
-msgstr "pakiety w starym formacie nie mogą być odpytywane\n"
-
-#: lib/query.c:490 lib/rpminstall.c:623
-#, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "%s: nie jest pakietem rpm (ani \"manifestem\" pakietu): %s\n"
-
-#: lib/query.c:519
-msgid "no packages\n"
-msgstr "brak pakietów\n"
-
-#: lib/query.c:537
-#, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "nieznana etykieta: \"%s\"\n"
-
-#: lib/query.c:563
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s nie zawiera żadnych pakietów\n"
 
-#: lib/query.c:572
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "żaden pakiet nie zahacza %s\n"
 
-#: lib/query.c:585 lib/query.c:606 lib/query.c:626 lib/query.c:660
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "błędne sformułowanie %s: %s\n"
 
-#: lib/query.c:595 lib/query.c:612 lib/query.c:636 lib/query.c:665
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "żaden pakiet nie pasuje do %s: %s\n"
 
-#: lib/query.c:675
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "żaden pakiet nie wymaga %s\n"
 
-#: lib/query.c:686
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "żaden pakiet nie udostępnia %s\n"
 
-#: lib/query.c:725
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: lib/query.c:729
+#: lib/query.c:626
 #, 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:754
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "błędny numer pakietu: %s\n"
 
-#: lib/query.c:757
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "numer rekordu pakietu: %u\n"
 
-#: lib/query.c:762
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "nie można odczytać rekordu %u\n"
 
-#: lib/query.c:772 lib/rpminstall.c:793
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr "(dodane pliki)"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr "(dodany zasób)"
 
@@ -2575,35 +2652,57 @@ msgstr "pakiet %s ma niespełnione %s: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominięty z powodu flagi missingok\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr "========== przesunięcia\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d wyłączenie  %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d przesunięcie %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "wyłączanie %s %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie katalogu %s do %s\n"
 
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "otwarcie %s nie powiodło się: %s\n"
+
+#: lib/rpmgi.c:355
+#, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "nieznana etykieta: \"%s\"\n"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+msgid "Failed dependencies:\n"
+msgstr "Niespełnione zależności:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr "    Sugerowane sposoby spełnienia:\n"
+
 #: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "Przygotowywanie..."
@@ -2650,7 +2749,7 @@ msgstr "... jako %s\n"
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s pomijany - transmisja %s nie powiodła się\n"
 
-#: lib/rpminstall.c:496 lib/rpminstall.c:887 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie może być zainstalowany\n"
@@ -2680,20 +2779,16 @@ msgstr "błąd czytania z pliku %s\n"
 msgid "file %s requires a newer version of RPM\n"
 msgstr "plik %s wymaga nowszej wersji RPM-a\n"
 
+#: lib/rpminstall.c:623
+#, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "%s: nie jest pakietem rpm (ani \"manifestem\" pakietu): %s\n"
+
 #: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n"
 
-#: lib/rpminstall.c:652 lib/rpminstall.c:825 lib/rpminstall.c:1259
-#: lib/transaction.c:1012 tools/rpmgraph.c:195
-msgid "Failed dependencies:\n"
-msgstr "Niespełnione zależności:\n"
-
-#: lib/rpminstall.c:659 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr "    Sugerowane sposoby spełnienia:\n"
-
 #: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "instalacja pakietów binarnych\n"
@@ -2708,28 +2803,28 @@ msgstr "nie można otworzyć pliku %s: %s\n"
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" określa wiele pakietów\n"
 
-#: lib/rpminstall.c:871
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie można otworzyć %s: %s\n"
 
-#: lib/rpminstall.c:877
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
 
-#: lib/rpminstall.c:1253 lib/transaction.c:1005
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "Cofnięcie pakietów (+%d/-%d) do %-24.24s (0x%08x):\n"
 
-#: lib/rpminstall.c:1284 lib/transaction.c:1056
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
 msgid "Cleaning up repackaged packages:\n"
 msgstr "Czyszczenie przepakowanych pakietów:\n"
 
 #. @innercontinue@
 #. XXX can't happen
-#: lib/rpminstall.c:1291 lib/transaction.c:1062
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
 #, c-format
 msgid "\tRemoving %s:\n"
 msgstr "\tUsuwanie %s\n"
@@ -2950,102 +3045,102 @@ msgstr "Nie można odczytać %s, HOME jest zbyt duże.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie można otworzyć %s do odczytu: %s.\n"
 
-#: lib/rpmsx.c:359
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:376
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:407
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:422 lib/rpmsx.c:437
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:450
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr "%s:  nieprawidłowy kontekst %s w lini numer %d\n"
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie można otworzyć bazy danych Packages w %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "dodatkowe '(' w etykiecie pakietu: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "brak '(' w etykiecie pakietu: %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "brak ')' w etykiecie pakietu: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "nie można otworzyć bazy danych Solve w %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, c-format
 msgid "Adding: %s\n"
 msgstr "Dodawane: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Sugerowane: %s\n"
 
-#: lib/rpmts.c:1142
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr "podmontowane systemy plików:\n"
 
-#: lib/rpmts.c:1144
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr "    i    urz bloków  bl.wolnych    i.wolnych punkt montowania\n"
 
-#: lib/rpmts.c:1200
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr "%5d 0x%04x %5u %12ld %12ld %s\n"
 
-#: lib/rpmts.c:1535
+#: lib/rpmts.c:1558
 #, c-format
 msgid "Creating transaction score board(%p, %p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1540
+#: lib/rpmts.c:1563
 #, c-format
 msgid "\tScore board address:  %p\n"
 msgstr ""
 
-#: lib/rpmts.c:1550
+#: lib/rpmts.c:1573
 #, c-format
 msgid "\tAllocating space for %d entries\n"
 msgstr "\tPrzydzielanie przestrzeni na %d wpisów\n"
 
 #. @-compdef -usereleased@
 #. XXX p->fi->te undefined.
-#: lib/rpmts.c:1577
+#: lib/rpmts.c:1600
 #, c-format
 msgid "\tAdding entry for %s to score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1581
+#: lib/rpmts.c:1604
 #, c-format
 msgid "\t\tEntry address:  %p\n"
 msgstr ""
@@ -3053,27 +3148,27 @@ msgstr ""
 #. We found this one, so just add the element type to the one
 #. * already there.
 #.
-#: lib/rpmts.c:1592
+#: lib/rpmts.c:1615
 #, c-format
 msgid "\tUpdating entry for %s in score board.\n"
 msgstr ""
 
-#: lib/rpmts.c:1617
+#: lib/rpmts.c:1640
 #, c-format
 msgid "May free Score board(%p)\n"
 msgstr ""
 
-#: lib/rpmts.c:1632
+#: lib/rpmts.c:1655
 msgid "\tRefcount is zero...will free\n"
 msgstr ""
 
 #. Assume we don't find it
-#: lib/rpmts.c:1682
+#: lib/rpmts.c:1705
 #, c-format
 msgid "Looking in score board(%p) for %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1688
+#: lib/rpmts.c:1711
 #, c-format
 msgid "\tFound entry at address:  %p\n"
 msgstr ""
@@ -3213,70 +3308,70 @@ msgstr "Rozmiar nagłówka+danych: "
 msgid "MD5 digest: "
 msgstr "Skrót MD5: "
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 msgid "Header SHA1 digest: "
 msgstr "Skrót SHA1 nagłówka: "
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 msgid "V3 RSA/MD5 signature: "
 msgstr "Sygnatura V3 RSA/MD5: "
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr "Nagłówek "
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr "Sygnatura V3 DSA: "
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
 #, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Weryfikacja sygnatury: BŁĘDNE PARAMETRY\n"
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
 #, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Uszkodzony skrót MD5: NIE OBSŁUGIWANY\n"
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Sygnatura: NIEZNANA (%d)\n"
 
 #. @innercontinue@
-#: lib/transaction.c:916
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "wyłączanie katalogu %s\n"
 
-#: lib/transaction.c:1003
+#: lib/transaction.c:1010
 msgid "Transaction failed...rolling back\n"
 msgstr "Transakcja niepowiodła się... wycowuję\n"
 
-#: lib/transaction.c:1023
+#: lib/transaction.c:1030
 msgid "Could not order auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1113
+#: lib/transaction.c:1120
 msgid "Getting repackaged header from transaction element\n"
 msgstr ""
 
 #. Get the index of possible repackaged packages
-#: lib/transaction.c:1138
+#: lib/transaction.c:1145
 #, c-format
 msgid "\tLooking for %s...\n"
 msgstr "\tPoszukiwanie %s...\n"
 
-#: lib/transaction.c:1142
+#: lib/transaction.c:1149
 msgid "\tMatches found.\n"
 msgstr "\tPasujących znaleziono.\n"
 
-#: lib/transaction.c:1146
+#: lib/transaction.c:1153
 msgid "\tNo matches found.\n"
 msgstr "\tNie znaleziono pasujących.\n"
 
-#: lib/transaction.c:1159
+#: lib/transaction.c:1166
 msgid "\tRepackaged package not found!.\n"
 msgstr "\tPrzepakowany pakiet nie znaleziony!.\n"
 
@@ -3287,38 +3382,38 @@ msgstr "\tPrzepakowany pakiet nie znaleziony!.\n"
 #. * would be found.
 #. * XXX:  Should Match NAC!
 #.
-#: lib/transaction.c:1180
+#: lib/transaction.c:1187
 msgid "\tREMOVETID matched INSTALLTID.\n"
 msgstr ""
 
-#: lib/transaction.c:1182
+#: lib/transaction.c:1189
 #, c-format
 msgid "\t\tName:  %s.\n"
 msgstr "\t\tNazwa:  %s.\n"
 
-#: lib/transaction.c:1205
+#: lib/transaction.c:1212
 #, c-format
 msgid "\tRepackaged Package was %s...\n"
 msgstr "\tPrzepakowany Pakiet %s...\n"
 
-#: lib/transaction.c:1249
+#: lib/transaction.c:1256
 msgid "Adding install element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1258
+#: lib/transaction.c:1265
 msgid "Could not get install element database instance!\n"
 msgstr ""
 
-#: lib/transaction.c:1271
+#: lib/transaction.c:1278
 msgid "Could not get header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1281
+#: lib/transaction.c:1288
 #, c-format
 msgid "\tAdded repackaged package header: %s.\n"
 msgstr "\tDodano przepakowany nagłówek pakietu: %s.\n"
 
-#: lib/transaction.c:1283 lib/transaction.c:1294
+#: lib/transaction.c:1290 lib/transaction.c:1301
 #, c-format
 msgid "\tAdded from install element %s.\n"
 msgstr ""
@@ -3326,46 +3421,46 @@ msgstr ""
 #. Add the header as an erase element, we did not
 #. * have a repackaged package
 #.
-#: lib/transaction.c:1292
+#: lib/transaction.c:1299
 msgid "\tAdded erase element.\n"
 msgstr ""
 
-#: lib/transaction.c:1301
+#: lib/transaction.c:1308
 msgid "Could not get repackaged header for auto-rollback transaction!\n"
 msgstr ""
 
-#: lib/transaction.c:1308
+#: lib/transaction.c:1315
 msgid "Add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1316
+#: lib/transaction.c:1323
 msgid "\tFound existing upgrade element.\n"
 msgstr ""
 
-#: lib/transaction.c:1317
+#: lib/transaction.c:1324
 #, c-format
 msgid "\tNot adding erase element for %s.\n"
 msgstr ""
 
-#: lib/transaction.c:1334
+#: lib/transaction.c:1341
 #, c-format
 msgid "\tAdded repackaged package %s.\n"
 msgstr "\tDodano przepakowany pakiet %s.\n"
 
-#: lib/transaction.c:1336
+#: lib/transaction.c:1343
 #, c-format
 msgid "\tAdded from erase element %s.\n"
 msgstr "\tDodano usunięty element %s.\n"
 
-#: lib/transaction.c:1341
+#: lib/transaction.c:1348
 msgid "Could not add erase element to auto-rollback transaction.\n"
 msgstr ""
 
-#: lib/transaction.c:1347
+#: lib/transaction.c:1354
 msgid "\tNo repackaged package...nothing to do.\n"
 msgstr ""
 
-#: lib/transaction.c:1353
+#: lib/transaction.c:1360
 msgid "Failure reading repackaged package!\n"
 msgstr "Bład podczas odczytu przepakowanego pakietu!\n"
 
@@ -3377,12 +3472,12 @@ msgstr "Bład podczas odczytu przepakowanego pakietu!\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1475
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "sprawdzanie poprawności %d elementów\n"
 
-#: lib/transaction.c:1560
+#: lib/transaction.c:1569
 msgid "running pre-transaction scripts\n"
 msgstr ""
 
@@ -3394,7 +3489,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1630
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "obliczanie %d odcisków plików\n"
@@ -3402,31 +3497,31 @@ msgstr "obliczanie %d odcisków plików\n"
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1711
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr "obliczanie dyspozycji plików\n"
 
-#: lib/transaction.c:1888
+#: lib/transaction.c:1897
 msgid "Creating auto-rollback transaction\n"
 msgstr "Tworzenie transakcji auto-wycofywania\n"
 
-#: lib/transaction.c:2042
+#: lib/transaction.c:2051
 msgid "Add failed.  Could not read package header.\n"
 msgstr "Dodanie niepowiodło się. Nie można przeczytać nagłółka pakietu.\n"
 
-#: lib/transaction.c:2106
+#: lib/transaction.c:2115
 msgid "Add failed in rpmpsmStage().\n"
 msgstr "Dodanie niepowiodło się w rpmpsmStage().\n"
 
-#: lib/transaction.c:2150
+#: lib/transaction.c:2159
 msgid "Add failed.  Could not get file list.\n"
 msgstr "Dodanie niepowiodło się. Nie można uzyskać listy plików.\n"
 
-#: lib/transaction.c:2199
+#: lib/transaction.c:2208
 msgid "Erase failed failed in rpmpsmStage().\n"
 msgstr "Usuwanie niepowiodło się w rpmpsmStage().\n"
 
-#: lib/transaction.c:2257
+#: lib/transaction.c:2266
 msgid "running post-transaction scripts\n"
 msgstr "uruchamianie skryptów po-transakcyjnych\n"
 
@@ -3465,137 +3560,137 @@ msgstr "usunięto    środowisko db %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "otwieranie  środowiska db %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "zamknięto   indeks db     %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "sprawdzono  indeks db     %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 "znaleziono wyłączne muteksy posix(%d), dodanie DB_PRIVATE, użycie blokady "
 "fcntl\n"
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "otwieranie  indeksu db    %s/%s %s w trybie 0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nie można uzyskać %s blokady na %s/%s\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "wyłącznej"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "dzielonej"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "zablokowano indeks db    %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "nierozpoznana opcja db: \"%s\" zignorowana.\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s ma błędną wartość liczbową, pominięto\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s ma zbyt dużą lub zbyt małą wartość long, pominięto\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s ma zbyt dużą lub zbyt małą wartość całkowitą, pominięto\n"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "brak { po %"
 
-#: rpmdb/header.c:2746
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "brak } po %{"
 
-#: rpmdb/header.c:2762
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "pusty format etykiety"
 
-#: rpmdb/header.c:2774
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "pusta nazwa etykiety"
 
-#: rpmdb/header.c:2783
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "nieznana etykieta"
 
-#: rpmdb/header.c:2810
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "spodziewany ] na końcu tablicy"
 
-#: rpmdb/header.c:2823
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "nie spodziewany ]"
 
-#: rpmdb/header.c:2836
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "nie spodziewany }"
 
-#: rpmdb/header.c:2900
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "spodziewany ? w wyrażeniu"
 
-#: rpmdb/header.c:2907
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "spodziewany { po ? w wyrażeniu"
 
-#: rpmdb/header.c:2919 rpmdb/header.c:2959
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "spodziewany } w wyrażeniu"
 
-#: rpmdb/header.c:2927
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "spodziewany : po podwyrażeniu ?"
 
-#: rpmdb/header.c:2945
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "spodziewany { po : w wyrażeniu"
 
-#: rpmdb/header.c:2967
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "spodziewany | na końcu wyrażenia"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3068
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr "(indeks spoza zakresu)"
 
-#: rpmdb/header.c:3315
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr "iterator tablicy użyty na tablicach o różnych rozmiarach"
 
-#: rpmdb/header.c:3631
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr "%c"
 
-#: rpmdb/header.c:3647
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
@@ -3621,267 +3716,267 @@ msgstr "sprawdź pliki bazy danych"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "generuj nagłówki kompatybilne z (wymierającymi) pakietami rpm[23]"
 
-#: rpmdb/rpmdb.c:218
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nierozpoznana nazwa etykiety: \"%s\" zignorowana\n"
 
-#: rpmdb/rpmdb.c:287
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nie można otworzyć indeksu %s przy użyciu db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:307
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "nie można otworzyć indeksu %s\n"
 
-#: rpmdb/rpmdb.c:922
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr "ścieżka bazy danych nie została podana\n"
 
-#: rpmdb/rpmdb.c:1200 rpmdb/rpmdb.c:1329 rpmdb/rpmdb.c:1380 rpmdb/rpmdb.c:2340
-#: rpmdb/rpmdb.c:2460 rpmdb/rpmdb.c:3235
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "błąd(%d) pobierania rekordów \"%s\" z indeksu %s\n"
 
-#: rpmdb/rpmdb.c:1574
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: pomijanie"
 
-#: rpmdb/rpmdb.c:1584
+#: rpmdb/rpmdb.c:1587
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "błąd(%d) zapisywania rekordu #%d do %s\n"
 
-#: rpmdb/rpmdb.c:2228
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: pomijanie"
 
-#: rpmdb/rpmdb.c:2260
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: uszkodzony nagłówek #%u odtworzony -- pomijanie.\n"
 
-#: rpmdb/rpmdb.c:2564
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: nie można odczytać nagłówka pod 0x%x\n"
 
-#: rpmdb/rpmdb.c:2630
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "błąd(%d) ustawiania rekordu nagłówka #%d do usunięcia %s\n"
 
-#: rpmdb/rpmdb.c:2745
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie \"%s\" z indeksu %s.\n"
 
-#: rpmdb/rpmdb.c:2749
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "usuwanie %d wpisów z indeksu %s.\n"
 
-#: rpmdb/rpmdb.c:2777
+#: rpmdb/rpmdb.c:2780
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "błąd(%d) ustawiania rekordów \"%s\" z indeksu %s\n"
 
-#: rpmdb/rpmdb.c:2798
+#: rpmdb/rpmdb.c:2801
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "błąd(%d) zapisywania rekordu \"%s\" do %s\n"
 
-#: rpmdb/rpmdb.c:2808
+#: rpmdb/rpmdb.c:2811
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "błąd(%d) usuwania rekordu \"%s\" z %s\n"
 
-#: rpmdb/rpmdb.c:2973
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "błąd(%d) alokowania nowej instancji pakietu\n"
 
-#: rpmdb/rpmdb.c:3038
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: pomijanie"
 
-#: rpmdb/rpmdb.c:3210
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "dodawanie \"%s\" do indeksu %s.\n"
 
-#: rpmdb/rpmdb.c:3214
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "dodawanie %d wpisów do indeksu %s.\n"
 
-#: rpmdb/rpmdb.c:3254
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "błąd(%d) zapisywania rekordu %s do %s\n"
 
-#: rpmdb/rpmdb.c:3656
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "usuwanie %s po udanym przebudowaniu db3.\n"
 
-#: rpmdb/rpmdb.c:3694
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "ścieżka bazy danych nie została podana"
 
-#: rpmdb/rpmdb.c:3726
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywanie bazy danych %s w %s\n"
 
-#: rpmdb/rpmdb.c:3730
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tymczasowa baza danych %s już istnieje\n"
 
-#: rpmdb/rpmdb.c:3736
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu %s\n"
 
-#: rpmdb/rpmdb.c:3738
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "tworzenie katalogu %s: %s\n"
 
-#: rpmdb/rpmdb.c:3745
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych przy użyciu dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych przy użyciu dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3786
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "nagłówek #%u w bazie danych jest błędny -- pominięto.\n"
 
-#: rpmdb/rpmdb.c:3826
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie można dodać rekordu będącego oryginalnie przy %u\n"
 
-#: rpmdb/rpmdb.c:3840
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "przebudowanie bazy nie powiodło się; stara pozostała na miejscu\n"
 
-#: rpmdb/rpmdb.c:3848
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na nową nie powiodła się!\n"
 
-#: rpmdb/rpmdb.c:3850
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "aby odzyskać, należy zastąpić pliki w %s plikami z %s"
 
-#: rpmdb/rpmdb.c:3860
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr "usuwanie katalogu %s\n"
 
-#: rpmdb/rpmdb.c:3862
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
 
-#: rpmio/macro.c:234
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktywny %d pusty %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:392
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(pusty)"
 
-#: rpmio/macro.c:435
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(pusty)\n"
 
-#: rpmio/macro.c:662 rpmio/macro.c:703
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s ma nie zakończone ciało\n"
 
-#: rpmio/macro.c:725
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s ma niedozwoloną nazwę (%%define)\n"
 
-#: rpmio/macro.c:731
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s ma nie zakończone opcje\n"
 
-#: rpmio/macro.c:736
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s ma puste ciało\n"
 
-#: rpmio/macro.c:742
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Rozwinięcie makra %%%s nie powiodło się\n"
 
-#: rpmio/macro.c:777
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s ma niedozwoloną nazwę (%%undefine)\n"
 
-#: rpmio/macro.c:895
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) nie było użyte poniżej poziomu %d\n"
 
-#: rpmio/macro.c:1022
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Nieznana opcja %c w %s(%s)\n"
 
-#: rpmio/macro.c:1222
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Głębokość rekursji(%d) większa niż maksymalna(%d)\n"
 
-#: rpmio/macro.c:1293 rpmio/macro.c:1310
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Niezakończone %c: %s\n"
 
-#: rpmio/macro.c:1351
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Napotkano nieprzetwarzalne makro po %%\n"
 
-#: rpmio/macro.c:1506
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Nie znaleziono makra %%%.*s, makro pominięte\n"
 
-#: rpmio/macro.c:1839
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "Przepełnienie bufora docelowego\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:2045 rpmio/macro.c:2051
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Plik %s: %s\n"
 
-#: rpmio/macro.c:2054
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Plik %s jest mniejszy niż %u bajtów\n"
@@ -4003,56 +4098,25 @@ msgstr "port musi być liczbą\n"
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiodło się: %s\n"
 
-#: tools/rpmcache.c:514 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 msgid "don't verify header+payload signature"
 msgstr "nie sprawdzaj sygnatury nagłówka+danych"
 
-#: tools/rpmcache.c:517
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr "nie uaktualniaj bazy danych bufora, tylko wypisz ścieżki pakietu"
 
-#: tools/rpmcache.c:521
-msgid "follow command line symlinks"
-msgstr "podążaj za dowiązaniami z linii poleceń"
-
-#: tools/rpmcache.c:524
-msgid "logical walk"
-msgstr "przechodź logicznie"
-
-#: tools/rpmcache.c:527
-msgid "don't change directories"
-msgstr "nie zmieniaj katalogów"
-
-#: tools/rpmcache.c:530
-msgid "don't get stat info"
-msgstr "nie odczytuj informacji stat"
-
-#: tools/rpmcache.c:533
-msgid "physical walk"
-msgstr "przechodź fizycznie"
-
-#: tools/rpmcache.c:536
-msgid "return dot and dot-dot"
-msgstr "zwracaj kropkę i kropkę-kropkę"
-
-#: tools/rpmcache.c:539
-msgid "don't cross devices"
-msgstr "nie przechodź między urządzeniami"
-
-#: tools/rpmcache.c:542
-msgid "return whiteout information"
-msgstr "zwróć informacje o whiteout"
-
-#: tools/rpmcache.c:545 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr "Wspólne opcje dla wszystkich trybów i binarek rpm-a:"
+#: tools/rpmcache.c:519
+#, fuzzy
+msgid "File tree walk options:"
+msgstr "Opcje dotyczące sygnatur:"
 
-#: tools/rpmcache.c:577
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: makro %%{_cache_dbpath} jest błędnie skonfigurowane.\n"
 
-#: tools/rpmcache.c:617
+#: tools/rpmcache.c:595
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: operacja na cache nie powiodła się: ec %d.\n"
@@ -4151,6 +4215,27 @@ msgstr "użyj bazy danych w KATALOGu"
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "Wspólne opcje dla wszystkich trybów rpm-a:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles można użyć tylko w trakcie instalacji pakietów"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "linia %d: Nazwa pliku niedozwolona: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "instaluj nawet gdy pakiet zastępuje inne zainstalowane pliki"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "odpytywanie %s nie powiodło się\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "pakiety w starym formacie nie mogą być odpytywane\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "brak pakietów\n"
+
 # --- from popt/po/pl.po (in popt.h, not in .pot) ---
 #~ msgid "Options implemented via popt alias/exec:"
 #~ msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
diff --git a/po/pt.po b/po/pt.po
index 4e8a59811..8a960cdc5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -63,10 +63,12 @@ msgid "Building for target %s\n"
 msgstr "A construir para o alvo %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "o argumento năo é um pacote RPM\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "erro ao ler o cabeçalho do pacote\n"
 
@@ -83,156 +85,162 @@ msgstr "Opçőes de pesquisa (com o -q ou o --query):"
 msgid "Verify options (with -V or --verify):"
 msgstr "Opçőes de verificaçăo (com o -V ou o --verify):"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "Opçőes de verificaçăo (com o -V ou o --verify):"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "Opçőes de assinatura:"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "Opçőes da base de dados:"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Opçőes de criaçăo com [ <fich spec> | <fich tar> | <pacote fonte> ]:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opçőes de Instalaçăo/Actualizaçăo/Remoçăo:"
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
 msgstr "Opçőes comuns para todos os modos do rpm:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versăo %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Este programa pode ser distribuído livremente sob os termos da GPL da GNU"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "só pode ser especificado um 'major mode'"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "só pode ser realizado um tipo de pesquisa/verificaçăo de cada vez"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "opçőes de pesquisa inesperadas"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "formato de pesquisa inesperado"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "origem de pesquisa inesperada"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "só a instalaçăo, a actualizaçăo, o rmsource e o rmpspec podem ser forçados"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr ""
 "os ficheiros só podem ser mudados de sítio durante a instalaçăo do pacote"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "o --relocate e o --excludepath só podem ser usados ao instalar pacotes novos"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "o --prefix só pode ser usado ao instalar pacotes novos"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "os argumentos do --prefix tęm de começar por /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "o --hash (-h) só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "o --percent só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "o --replacefiles só pode ser indicado durante a instalaçăo do pacote"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "o --replacepkgs só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "o --excludedocs  só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "o --includedocs  só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "só uma das opçőes --excludedocs e --includedocs pode ser usada"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "o --ignorearch só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "o --ignoreos só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "o --ignoresize só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "o --allmatches só pode ser indicado ao apagar o pacote"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "o --allfiles só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "o --justdb só pode ser indicado durante a instalaçăo ou a remoçăo do pacote"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -240,7 +248,7 @@ msgstr ""
 "a desactivaçăo de 'scripts' só pode ser indicado durante a instalaçăo ou a "
 "remoçăo de pacotes"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -248,7 +256,7 @@ msgstr ""
 "a desactivaçăo dos 'triggers' só pode ser usado durante a instalaçăo ou "
 "remoçăo de pacotes"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -256,7 +264,7 @@ msgstr ""
 "o --nodeps só pode ser indicado durante a criaçăo, reconstruçăo, "
 "recompilaçăo, instalaçăo, remoçăo ou verificaçăo do pacote"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -264,7 +272,7 @@ msgstr ""
 "o --test só pode ser indicado durante a instalaçăo, remoçăo ou criaçăo do "
 "pacote"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -272,82 +280,87 @@ msgstr ""
 "o --root (-r) só pode ser indicado durante a instalaçăo, remoçăo ou pesquisa "
 "do pacote ou na reconstruçăo da base de dados"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "os argumentos do --root (-r) tęm de começar por /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "năo existem ficheiros a assinar\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "năo consigo aceder ao ficheiro %s\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp năo encontrado: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Indique a palavra-chave: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "A verificaçăo da palavra-chave falhou\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "A palavra-chave está correcta.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Spec %%_signature inválido no ficheiro de macros.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "o --sign só pode ser usado na criaçăo do pacote"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "o exec falhou\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "năo foram indicados pacotes para a reconstruçăo"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "năo foram indicados ficheiros spec para a criaçăo"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "năo foram indicados ficheiros tar para a criaçăo"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr "năo foram indicados pacotes para apagar"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "năo foram indicados pacotes para instalar"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "năo foram indicados argumentos para a pesquisa"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "năo foram indicados argumentos para a verificaçăo"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "năo foram indicados argumentos para a pesquisa"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Năo consegui abrir um ficheiro temporário.\n"
 
@@ -426,176 +439,176 @@ msgstr "&& e || năo suportados em cadeias de caracteres\n"
 msgid "syntax error in expression\n"
 msgstr "erro de sintaxe na expressăo\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "Falha no TIMECHECK: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Falta um '(' em %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Falta um ')' em %s(%s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Elemento %s inválido: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Falta um %s em %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Carácter sem ser espaço a seguir a %s(): %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Sintaxe inválida: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Spec de modo inválido: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Spec de dirmode inválido: %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Tamanho anormal do locale: \"%.*s\" no %%lang(%s)\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Locale %.*s duplicado no %%lang(%s)\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Limite atingido para o %%docdir\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Só um argumento no %%docdir\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dois ficheiros na mesma linha: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "O ficheiro tem de começar por \"/\": %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Năo é possível misturar o %%doc especial com outras formas: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Ficheiro listado duas vezes: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "A 'symlink' aponta para a BuildRoot: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "O ficheiro năo corresponde ao prefixo (%s): %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Ficheiro năo encontrado: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "O ficheiro precisa de começar por \"/\": %s\n"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob năo permitido: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Ficheiro năo encontrado pelo glob: %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Năo consegui abrir o ficheiro do %%files %s: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ficheiro inválido: %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Dono/grupo inválido: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "A processar os ficheiros: %s-%s-%s\n"
@@ -649,7 +662,7 @@ msgstr "a escrita do cpio_copy falhou: %s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "a leitura do cpio_copy falhou: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Năo consegui abrir o ficheiro PreIn: %s\n"
@@ -659,124 +672,124 @@ msgstr "Năo consegui abrir o ficheiro PreIn: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Năo consegui abrir o ficheiro PreUn: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Năo consegui abrir o ficheiro PostIn: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Năo consegui abrir o ficheiro PostUn: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Năo consegui abrir o ficheiro VerifyScript: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Năo consegui aceder ao 'script' Trigger: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: aceder ao %s: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ler o %s: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: O Fseek falhou: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: o %s năo é um pacote RPM\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: a ler o cabeçalho do %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 msgid "Unable to create immutable header region.\n"
 msgstr "Năo consegui criar regiăo imutável do cabeçalho.\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 msgid "Unable to write temp header\n"
 msgstr ""
 "Năo consegui gravar o cabeçalho temporário\n"
 "\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "Dados de CSA inválidos\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 msgid "Unable to write final header\n"
 msgstr "Năo consegui gravar o cabeçalho final\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "A gerar a assinatura: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 msgid "Unable to reload signature header.\n"
 msgstr "Năo consegui reler o cabeçalho do assinatura.\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Năo consigo aceder ao %s: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Năo consegui gravar o pacote: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Năo consegui abrir o sigtarget %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Năo consegui ler o cabeçalho de %s: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Năo consegui gravar o cabeçalho de %s: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Năo consegui ler o conteúdo de %s: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Năo consegui escrever o conteúdo de %s: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Năo consigo gerar o ficheiro de saída para o pacote %s: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "năo consigo criar o %s: %s\n"
@@ -821,17 +834,17 @@ msgstr "falta a descriçăo no %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linha %d: Erro ao analisar a %%description: %s\n"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linha %d: Opçăo inválida %s: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "linha %d: Demasiados nomes: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "linha %d: O pacote năo existe: %s\n"
@@ -851,123 +864,128 @@ msgstr "linha %d: Erro ao analisar o %%files: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "linha %d: Segunda lista de %%files\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "A arquitectura está excluída: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "A arquitectura năo está incluída: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "O SO está excluído: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "O SO năo está incluído: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "O campo %s tem de estar presente no pacote: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Entradas %s duplicadas no pacote: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Năo consegui abrir o ícone %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Năo consegui ler o ícone %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Tipo de ícone desconhecido: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "linha %d: Opçăo só recebe um parâmetro: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "Linha %d: Opçăo inválida: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linha %d: Opçăo em branco: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "linha %d: Carácter '-' ilegal no %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "O BuildRoot năo pode ser o \"/\": %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "linha %d: Os prefixos năo podem acabar em \"/\": %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linha %d: A docdir tem de começar por '/': %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "linha %d: O campo Epoch/Serial tem de ser um número: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linha %d: Qualificadores %s: inválidos: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linha %d: Formato da BuildArchitecture inválido: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Erro interno: Opçăo esquisita %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Descriçăo do pacote inválida: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "O pacote já existe: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linha %d: Opçăo desconhecida: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "O ficheiro spec năo pode usar a BuildRoot\n"
 
@@ -1048,82 +1066,87 @@ msgstr ""
 "linha %d: Os elementos de dependęncias tęm de começar por alfanuméricos, '_' "
 "ou '/': %s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "linha %d: Nome do ficheiro năo permitido: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "linha %d: Nome do ficheiro com versăo năo permitido: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "linha %d: Necessária a versăo: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "linha %d: os 'triggers' (que activam) tęm de ter --: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "linha %d: Erro ao analisar o %s: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "linha %d: o programa de 'script' tem de começar por '/': %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "linha %d: o programa de 'script' tem de começar por '/': %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "linha %d: Segundo %s\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "linha %d: Erro ao analisar a %%description: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "linha %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Incapaz de aceder ao %s: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if năo fechado\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: o parseExpressionBoolean devolve %d\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Descobri um %%else sem um %%if\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Descobri um %%endif sem um %%if\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "instruçăo %%include desorganizada\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "Năo foram encontradas arquitecturas compatíveis para as quais criar\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote năo tem uma %%description: %s\n"
@@ -1255,20 +1278,20 @@ msgstr "năo verificar as dependęncias de compilaçăo"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "gerar um cabeçalho do pacote compatível com os pacotes do rpm[23]"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "năo verificar as dependęncias do pacote"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "năo verifica a arquitectura do pacote"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verificar a assinatura do pacote"
@@ -1367,84 +1390,95 @@ msgstr "Ficheiro de arquivo năo está no cabeçalho"
 msgid " failed - "
 msgstr " falhou - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "o pacote %s já está instalado"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "o pacote %s já está instalado"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "ficheiro db inválido %s\n"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "nenhum pacote\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignorar relaçőes entre o nome do pacote [%d]\t%s -> %s\n"
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "a remover o %s-%s-%s \"%s\" das relaçőes do tsort.\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "=========== a guardar as relaçőes do tsort\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 "========== ordenar pacotes (order, #predecessors, #succesors, tree, depth)\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== só os sucessores (ordem de apresentaçăo)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "CICLO:\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== a prosseguir o tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(năo é um número)"
 
@@ -1456,7 +1490,7 @@ msgstr "(năo é um base64)"
 msgid "(invalid type)"
 msgstr "(tipo inválido)"
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr "(năo é um blob)"
 
@@ -1465,7 +1499,7 @@ msgstr "(năo é um blob)"
 msgid "(invalid xml type)"
 msgstr "(tipo inválido)"
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "ignorar as assinaturas de PGP"
@@ -1485,7 +1519,7 @@ msgstr "o mntctl() falhou ao devolver o número de pontos de montagem: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "Năo consegui analisar o %s: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
@@ -1562,268 +1596,310 @@ msgstr "%s unlink de %s falhou: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s criado como %s\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "a adicionar %d registos ao índice %s.\n"
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "năo consigo criar o %%%s %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "năo consigo escrever em %%%s %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "erro ao criar o ficheiro temporário %s\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "a versăo 1 dos pacotes năo é suportada por esta versăo do RPM\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "só os pacotes com versăo <= 4 săo suportados por esta versăo do RPM\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: o rpmReadSignature falhou\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Nenhuma assinatura disponível\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "a criar a directoria %s\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "imprimir a expansăo da macro <expr>+"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "ler o <fich:...> em vez do(s) ficheiro(s) de macros por omissăo"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "desactivar o uso da API da libio(3)"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "manda o stdout para <cmd>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "usa <dir> como a directoria de topo"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "mostrar as opçőes de pesquisa conhecidas"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "mostra a configuraçăo final do rpmrc e das macros"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "devolver um resultado menos detalhado"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "devolver um resultado mais detalhado"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "imprime a versăo do RPM que está a usar"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "depurar a sequęncia de dados do protocolo"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "depurar a E/S da rpmio"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "depurar a gestăo da 'cache' de URLs"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "as directorias de exclusăo tęm de começar por /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "os novos locais tęm de começar por /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "os novos locais tęm de conter um ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "os novos locais tęm de ter um / a seguir ao ="
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr "'rollback' recebe como argumento uma hora/data"
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr "argumento hora/data inválido para 'rollback'"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "pesquisar/verificar o(s) pacote(s) de transacçăo de instalaçăo"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instala todos os ficheiros, mesmo as configuraçőes que de outro modo seriam "
 "ignoradas"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1831,157 +1907,166 @@ msgstr ""
 "remove todos os pacotes que correspondam a <pacote> (normalmente aparece um "
 "erro se o <pacote> especifica vários pacotes)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "năo executar nenhuns scripts do pacote"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "muda os ficheiros de sítio num pacote de localizaçăo fixa"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 "gravar os ficheiros do pacote apagado mudando o nome para sub-directoria"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "apaga (desinstala) o pacote"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<pacote>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "listar todos os ficheiros de configuraçăo"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "năo instala a documentaçăo"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "ignorar os ficheiros com a componente inicial <dir> "
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<caminho>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "muda os ficheiros de sítio num pacote de localizaçăo fixa"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "abreviatura para --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "actualizar o pacote(s) se já estiver instalado"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<pacote>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "mostra cardinais enquanto o pacote instala (conveniente com o -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "năo verifica a arquitectura do pacote"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "năo verifica o sistema operativo do pacote"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "năo verifica o espaço em disco antes de instalar"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "instala a documentaçăo"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "instala o pacote"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "actualiza a base de dados, mas năo altera o sistema de ficheiros"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "năo verifica as dependęncias do pacote"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "năo verificar o MD5 dos ficheiros"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "listar todos os ficheiros de configuraçăo"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "năo reorganiza a instalaçăo dos pacotes para satisfazer as dependęncias"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "năo executar o script %%pre (se existir)"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "năo executar o script %%post (se existir)"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "năo executar o script %%preun (se existir)"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "năo executar o script %%postun (se existir)"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "năo executar nenhum dos scripts activados por este pacote"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "năo executar nenhum dos scripts %%triggerprein"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "năo executar nenhum dos scripts %%triggerin"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "năo executar nenhum dos scripts %%triggerun"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "năo executar nenhum dos scripts %%triggerpostun"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1989,474 +2074,490 @@ msgstr ""
 "actualiza para um versăo antiga do pacote (o --force faz isto "
 "automaticamente)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "mostra percentagens enquanto o pacote instala"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "muda o pacote para <dir>, se for possível"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "muda os ficheiros de <velho> para <novo>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<velho>=<novo>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr "gravar ficheiros apagados reempacotando-os"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "instala mesmo se o pacote substituir ficheiros instalados"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "reinstalar se o pacote já estiver presente"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "desinstalador novo, reinstalar velho, pacote(s) voltar ŕ <data>"
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr "<data>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "năo instala, mas indica se iria funcionar ou năo"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "actualizar pacote(s)"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "pesquisar/verificar todos os pacotes"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "modo de verificaçăo do rpm"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "pesquisar/verificar o(s) pacote(s) que contém(ęm) o ficheiro"
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
-msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do ficheiro"
-
-#: lib/poptQV.c:103
+#: lib/poptQV.c:108
 msgid "query/verify package(s) in group"
 msgstr "pesquisar/verificar o(s) pacote(s) no grupo"
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
-msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do cabeçalho"
-
-#: lib/poptQV.c:107
+#: lib/poptQV.c:110
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "pesquisar/verificar todos os pacotes"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
+msgstr "pesquisar/verificar o(s) pacote(s) de transacçăo de instalaçăo"
+
+#: lib/poptQV.c:115
+#, fuzzy
+msgid "query/verify package(s) from system HDLIST"
+msgstr "pesquisar/verificar o(s) pacote(s) de transacçăo de instalaçăo"
+
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do pacote"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do cabeçalho"
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do ficheiro"
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "modo de pesquisa do rpm"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do cabeçalho"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "pesquisar um ficheiro spec"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<spec>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr "pesquisar/verificar o(s) pacote(s) de transacçăo de instalaçăo"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "pesquisar o(s) pacote(s) activados pelo pacote"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "modo de verificaçăo do rpm"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "pesquisar/verificar o(s) pacote(s) que precisa duma dependęncia"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "pesquisar/verificar o(s) pacote(s) que oferecem uma dependęncia"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "năo foram indicados argumentos para a pesquisa"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: năo consigo ler o cabeçalho em 0x%x\n"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "listar todos os ficheiros de configuraçăo"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "listar todos os ficheiros de documentaçăo"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "apresentar a informaçăo básica do ficheiro"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "listar os ficheiros no pacote"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr "ignorar ficheiros %%ghost"
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr "ignorar ficheiro %%licence"
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr "ignorar ficheiros %%readme"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "usar o formato de pesquisa seguinte"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "substituir as secçőes i18n no ficheiro spec"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "mostrar os estados dos ficheiros listados"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "năo verificar os tamanho dos ficheiros"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "năo verificar as ligaçőes simbólicas dos ficheiros"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "năo verificar o dono dos ficheiros"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "năo verificar o grupo dos ficheiros"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "năo verificar hora de modificaçăo dos ficheiros"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "năo verificar o modo dos ficheiros"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "năo verificar os ficheiros no pacote"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "năo verificar os ficheiros no pacote"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "năo verificar as dependęncias do pacote"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "năo executar o %verifyscript (se existir)"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "năo verificar o SHA1 do cabeçalho"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "năo verificar o MD5 dos ficheiros"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "assinar um pacote (retira a assinatura actual)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verificar a assinatura do pacote"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "assinar um pacote (retira a assinatura actual)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "gerar a assinatura"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 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:386
+#: lib/psm.c:399
 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:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: a correr os scripts(s) %s (se existirem)\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet 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:1288
+#: lib/psm.c:1429
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s tem %d ficheiros, teste = %d\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n"
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Năo consegui reler o cabeçalho do assinatura.\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s falhou no ficheiro %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s falhou: %s\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "formato incorrecto: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(năo contém ficheiros)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "substituído   "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "năo instalado "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "partilhado"
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(sem estado)  "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(desconhecido %3d)"
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "o acesso ao %s falhou: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "a pesquisa do %s falhou\n"
-
-#: lib/query.c:453
-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:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "nenhum pacote coincide com %s: %s\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "nenhum pacote\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "opçăo desconhecida"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, 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:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nenhum pacote activa o %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "malformado %s: %s\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "nenhum pacote coincide com %s: %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nenhum pacote precisa do %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nenhum pacote oferece o %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ficheiro %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, 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:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "número de registo do pacote: %u\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "o registo %u năo pôde ser lido\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s năo está instalado\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "ficheiro db inválido %s\n"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s SIM (oferecidos para adiçăo)\n"
@@ -2554,15 +2655,15 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr "NĂO"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr "SIM"
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2571,13 +2672,13 @@ msgstr ""
 "A dependęncia \"B\" precisa duma época (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "o pacote %s tem requisitos năo satisfeitos: %s\n"
@@ -2587,158 +2688,187 @@ msgstr "o pacote %s tem requisitos năo satisfeitos: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido ŕ opçăo missingok\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr "========== mudanças de local\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d excluir o %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d mudar de local %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "a excluir o %s %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "a mudar o %s para %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "a mudar a directoria %s para %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "o acesso ao %s falhou: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "opçăo desconhecida"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "dependęncias falhadas:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "A preparar..."
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr "A preparar os pacotes para a instalaçăo..."
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 #, fuzzy
 msgid "Repackaging..."
 msgstr "A preparar..."
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 #, fuzzy
 msgid "Upgrading..."
 msgstr "A preparar..."
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "actualizar pacote(s)"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "A procurar o %s: (usando o %s)...\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "A obter o %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... como %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "a ignorar o %s - a transferęncia falhou - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "o %s năo pode ser instalado\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<pacote de código>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "o pacote %s năo pode ser mudado de sítio\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "a instalar os pacotes binários\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "erro ao ler do ficheiros %s\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "o %s precisa duma versăo mais recente do RPM\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "nenhum pacote coincide com %s: %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "encontrados %d pacotes com código-fonte e %d binários\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "dependęncias falhadas:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "a instalar os pacotes binários\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "năo consigo aceder ao ficheiro %s: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "o \"%s\" especifica vários pacotes\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "năo consigo aceder ao %s: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "A instalar o %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "A obter o %s\n"
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2753,7 +2883,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2780,6 +2910,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- năo suportado em cadeias de caracteres\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2859,174 +2994,229 @@ msgstr " está em conflito com o %s-%s-%s\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "falta o segundo ':' em %s:%d\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "falta o nome da arquitectura em %s:%d\n"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Linha de dados incompleta em %s:%d\n"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Demasiados argumentos na linha de dados em %s:%d\n"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Número de arq./SO errado: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Linha por omissăo incompleta em %s:%d\n"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Demasiados argumentos na linha por omissăo em %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Năo consegui ler o %s: %s.\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "falta um ':' (encontrado um 0x%02x) em %s:%d\n"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "faltam argumentos para o %s em %s:%d\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "a expansăo do %s falhou em %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "năo consigo abrir o %s em %s:%d: %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "falta a arquitectura para o %s em %s:%d\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "má opçăo '%s' em %s:%d\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Sistema desconhecido: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Por favor contacte o rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Năo consigo expandir o %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Năo consigo ler o %s, a HOME é demasiado grande.\n"
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Năo consegui abrir o %s para leitura: %s.\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "năo consigo abrir a base de dados Packages em %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Falta um '(' em %s %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "năo consigo a base de dados do RPM em %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "linha: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "A obter o %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "a mudar o %s para %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3044,6 +3234,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3068,6 +3259,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3135,6 +3327,9 @@ msgstr "Obtive %d bytes da assinatura do GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3159,44 +3354,168 @@ msgstr "Tamanho do cabeçalho demasiado grande"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "năo verificar o SHA1 do cabeçalho"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ignorar as assinaturas de MD5"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "'Digest' MD5 estragado: NĂO SUPORTADO\n"
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "a excluir a directoria %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr ""
+"esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "nenhum pacote coincide com %s: %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<pacote de código>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<pacote de código>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "erro ao ler o cabeçalho do pacote\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3205,11 +3524,15 @@ msgstr "a excluir a directoria %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3218,7 +3541,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3226,13 +3549,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "falta     %s"
 
 #: lib/verify.c:437
@@ -3265,135 +3612,135 @@ msgstr "removi o ambiente do db %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "a aceder ao ambiente do db %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "fechei o índice do db   %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "verifiquei o índice do db %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "a abrir o índice do db  %s/%s %s modo=0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "năo consigo trancar o %s no %s/%s\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "exclusivo"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "partilhado"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "tranquei o índice do db %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "opçăo do db desconhecida: \"%s\" ignorada.\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "O %s tem um valor numérico inválido, foi ignorado\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "O %s tem um valor demasiado elevado ou pequeno, foi ignorado\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "O %s tem um valor inteiro demasiado elevado ou pequeno, foi ignorado\n"
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "falta um { depois do %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "falta um } depois do %{"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "formato da opçăo em branco"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "nome da opçăo em branco"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "opçăo desconhecida"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "] esperado no fim do vector"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "] inesperado"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "} inesperado"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "esperado um ? na expressăo"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "esperado um { a seguir ao ? na expressăo"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "esperado um } na expressăo"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "esperado um : a seguir ŕ sub-expressăo ?"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "esperado um { a seguir ao : na expressăo"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "esperado um | no fim da expressăo"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3420,326 +3767,326 @@ msgstr "verificar ficheiros da base de dados"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "gerar os cabeçalhos compatíveis com o formato do rpm[23]"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nome de opçăo năo reconhecido: \"%s\" ignorado\n"
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "năo consigo abrir o índice de %s usando o db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "năo consigo abrir o índice do %s\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr "năo foi definido o dbpath\n"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: năo consigo ler o cabeçalho em 0x%x\n"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "a remover o \"%s\" do índice %s.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "a remover %d registos do índice %s.\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erro(%d) ao remover o registo %s do %s\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erro(%d) ao criar uma nova instância do pacote\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "a adicionar o \"%s\" ao índice %s.\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "a adicionar %d registos ao índice %s.\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "a remover o %s depois duma reconstruçăo bem sucedida do db3.\n"
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "năo foi definido o dbpath"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "a reconstruir a base de dados %s em %s\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "A base de dados temporária %s já existe\n"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr "a criar a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "a criar a directoria %s: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "a abrir a base de dados antiga com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "a abrir a base de dados nova com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "o número do registo %u na base de dados está errado -- a ignorar.\n"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "năo consigo adicionar o registo originalmente em %u\n"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "falhou a reconstruçăo da base de dados: a base de dados original mantém-se\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "falhou a substituiçăo da base de dados antiga pela nova!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr "a remover a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falhou a remoçăo da directoria %s: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== activo %d vazio %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(vazio)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vazio)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "A macro %%%s tem o conteúdo incompleto\n"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "A macro %%%s tem um nome inválido (%%define)\n"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "A macro %%%s tem as opçőes incompletas\n"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "A macro %%%s tem o conteúdo em branco\n"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "A macro %%%s năo conseguiu ser expandida\n"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "A macro %%%s tem um nome ilegal (%%undefine)\n"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "A macro %%%s (%s) năo foi usada abaixo do nível %d\n"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opçăo desconhecida %c em %s(%s)\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Nível de recursividade(%d) maior que o máximo(%d)\n"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c năo terminado: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Segue-se uma macro impossível de analisar ao %%\n"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "A macro %%%.*s năo foi encontrada, por isso foi ignorada\n"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "Sobrecarga do tampăo de destino\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Ficheiro %s: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "O ficheiro %s tem menos de %u bytes\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "Sucesso"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Resposta errada do servidor"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr "Erro de E/S do servidor"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "Tempo de espera pelo servidor expirado"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "Incapaz de descobrir o endereço da máquina do servidor"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "Incapaz de descobrir o nome da máquina do servidor"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "Năo consegui ligar ao servidor"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "Năo consigo estabelecer uma ligaçăo de dados ao servidor"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr "Erro de E/S no ficheiro local"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Erro ao configurar o servidor remoto para o modo passivo"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Ficheiro năo encontrado no servidor"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "Interrupçăo em progresso"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "Erro desconhecido ou inesperado"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "a ligar ao %s como %s com senha %s\n"
@@ -3749,6 +4096,7 @@ msgid "(no error)"
 msgstr "(nenhum erro)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "erro fatal: "
@@ -3768,94 +4116,61 @@ msgstr "aviso: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "a alocaçăo de memória (%u bytes) devolveu NULL.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "aviso: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "aviso: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "aviso: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Senha para o %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "erro: o %sport tem de ser um número\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "o porto do URL tem de ser um número\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "năo consegui criar o %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "verificar a assinatura do pacote"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
+#: tools/rpmcache.c:519
 #, fuzzy
-msgid "don't change directories"
-msgstr "a criar a directoria %s\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-#, fuzzy
-msgid "Common options for all rpm modes and executables:"
-msgstr "Opçőes comuns para todos os modos do rpm:"
+msgid "File tree walk options:"
+msgstr "Opçőes de assinatura:"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: o acesso falhou: %s\n"
@@ -3952,6 +4267,29 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "Opçőes comuns para todos os modos do rpm:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr ""
+#~ "o --replacefiles só pode ser indicado durante a instalaçăo do pacote"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "linha %d: Nome do ficheiro năo permitido: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "instala mesmo se o pacote substituir ficheiros instalados"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "a pesquisa do %s falhou\n"
+
+#~ 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"
+
+#~ msgid "no packages\n"
+#~ msgstr "nenhum pacote\n"
+
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "a exclur a directoria 'multilib' %s%s\n"
 
@@ -3992,10 +4330,6 @@ msgstr ""
 #~ msgid "Old (internal-only) signature!  How did you get that!?\n"
 #~ msgstr "Assinatura (só interna) antiga! Como é que obteve isto!?\n"
 
-#, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "%s: a correr os scripts(s) %s (se existirem)\n"
-
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr "a execuçăo do script %s do %s-%s-%s falhou, waitpid devolveu %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a431534ff..c2e8109b2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,14 +4,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -71,10 +71,12 @@ msgid "Building for target %s\n"
 msgstr "instale pacote"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr ""
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr ""
 
@@ -92,29 +94,37 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 # , c-format
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
@@ -127,142 +137,139 @@ msgstr "No consegui ler o arquivo spec de %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verso %s\n"
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Este Software pode ser livremente redistribuido sob os termos da Licensa "
 "Pblica GNU (GPL)"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "somente um modo principal pode ser especificado"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "um tipo de pesquisa/verificao pode ser feita por vez"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 #, fuzzy
 msgid "unexpected query format"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "somente instalao e atualizao podem ser foradas"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumentos para --prefix devem comear com uma /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) somente podem ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches somente pode ser especificado durante desinstalaes de pacotes"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -271,7 +278,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -280,7 +287,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -289,7 +296,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalaes e verificaes "
 "de pacotes"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -297,7 +304,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -305,86 +312,89 @@ msgstr ""
 "--root (-r) somente pode ser especificado durante [des]instalaes, pesquisas "
 "e reconstruo de bancos de dados"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumentos para --root (-r) devem comear com uma /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:565
-#, fuzzy
+#: rpmqv.c:568
+#, fuzzy, c-format
 msgid "pgp not found: "
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Checagem de pass phrase falhou\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Pass phrase ok.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign somente pode ser usado durante a construo de pacotes"
 
-#: rpmqv.c:605
-#, fuzzy
+#: rpmqv.c:608
+#, fuzzy, c-format
 msgid "exec failed\n"
 msgstr "Construo falhou.\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "no foram passados pacotes para reconstruo"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "no foi passado arquivo spec para construo"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "no foram passados arquivos tar para construo"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "no foi passado argumento para pesquisa"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "no foi passado argumento para verificao"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "no foi passado argumento para pesquisa"
 
 # , c-format
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "No consegui abrir: %s\n"
@@ -470,189 +480,189 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr ""
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr ""
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr ""
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:599
+#: build/files.c:608
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:609
+#: build/files.c:618
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:621
+#: build/files.c:630
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 # , c-format
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1152
+#: build/files.c:1161
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1538
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
 # , c-format
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
 # , c-format
-#: build/files.c:1943
+#: build/files.c:1954
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:2350
+#: build/files.c:2362
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "instale pacote"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -711,7 +721,7 @@ msgid "cpio_copy read failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -723,144 +733,144 @@ msgid "Could not open PreUn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:236
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:251
+#: build/pack.c:265
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:266
+#: build/pack.c:280
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:295
+#: build/pack.c:309
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:305
+#: build/pack.c:319
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "gere assinatura PGP"
 
 # , c-format
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:596
+#: build/pack.c:610
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:647
+#: build/pack.c:661
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:658
+#: build/pack.c:672
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:672
+#: build/pack.c:686
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:682
+#: build/pack.c:696
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:688
+#: build/pack.c:702
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:815
+#: build/pack.c:829
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -907,19 +917,19 @@ msgid "line %d: Error parsing %%description: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
 # , c-format
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -941,12 +951,12 @@ msgstr "No consegui abrir: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
@@ -959,125 +969,130 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr ""
 
 # , c-format
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr ""
 
 # , c-format
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "      Opces para especificao de pacotes:"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1166,90 +1181,94 @@ msgid ""
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
 # , c-format
-#: build/parseReqs.c:113
-#, fuzzy, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "No consegui abrir: %s\n"
-
-# , c-format
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, fuzzy, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, fuzzy, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
 # , c-format
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, fuzzy, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "argumentos para o --dbpath devem comear com uma /"
+
+#: build/parseScript.c:209
 #, fuzzy, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
 # , c-format
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, fuzzy, c-format
 msgid "line %d: Second %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "no foi passado pacote para desinstalao"
+
 # , c-format
-#: build/parseSpec.c:158
+#: build/parseSpec.c:201
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
 # , c-format
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "%s no pode ser construido nesta arquitetura\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "no foi passado pacote para desinstalao"
@@ -1390,20 +1409,20 @@ msgstr "no verifique as dependncias do pacote"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "no verifique as dependncias do pacote"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "no verifique a arquitetura do pacote"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verifique a assinatura do pacote"
@@ -1509,82 +1528,93 @@ msgstr ""
 msgid " failed - "
 msgstr "Construo falhou.\n"
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr ""
 
 # , c-format
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "pesquise todos os pacotes"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
 # , c-format
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "No consegui abrir: %s\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr ""
 
@@ -1596,7 +1626,7 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr ""
 
@@ -1604,7 +1634,7 @@ msgstr ""
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "desconsidere quaisquer assinaturas PGP"
@@ -1627,7 +1657,7 @@ msgid "failed to stat %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -1707,275 +1737,319 @@ msgid "%s created as %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "No consegui abrir: %s\n"
+
+# , c-format
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, fuzzy, c-format
 msgid "error creating temporary file %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
 # , c-format
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
 # , c-format
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+# , c-format
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "No consegui abrir: %s\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "mostra a verso do programa rpm sendo usado"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "envia a saida padro para <cmd>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "use <diretrio> como diretrio raiz"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "mostra a verso do programa rpm sendo usado"
 
 # , c-format
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr ""
 
 # , c-format
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 #, fuzzy
 msgid "relocations must begin with a /"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr ""
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "no foi passado pacote para desinstalao"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1983,163 +2057,172 @@ msgstr ""
 "remova todos os pacotes iguais a <pacote> (normalmente um erro  gerado se "
 "<pacote> especificou mltiplos pacotes)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "no execute nenhuma script especfica do pacote"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "apague (desinstale) pacote"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 #, fuzzy
 msgid "<package>+"
 msgstr "pesquise todos os pacotes"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "liste somente os arquivos de configurao (implica -l)"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "no instale documentao"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "no foi passado pacote para instalao"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "alis para --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -b<estgio> <spec>    "
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "mostre caracteres # a medida que o pacote instala (bom com -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 #, fuzzy
 msgid "don't verify package architecture"
 msgstr "no verifique a arquitetura do pacote"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "no verifique o sistema operacional do pacote"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "instale documentao"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "instale pacote"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "no verifique as dependncias do pacote"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "instale pacote"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "liste somente os arquivos de configurao (implica -l)"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 #, fuzzy
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "no verifique as dependncias do pacote"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "no execute nenhuma script especfica do pacote"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "no execute nenhuma script de instalao"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "no execute nenhuma script de instalao"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "no execute nenhuma script de instalao"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2147,510 +2230,525 @@ msgstr ""
 "atualize para uma verso mais velha do pacote (--force em atualizaes no faz "
 "isto automaticamente)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "realoque o pacote para <diretrio>, se realocvel"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "instale mesmo que o pacote substitua arquivos j instalados"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "reinstale se o pacote j estiver presente"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "no instale, mas diga se a instalao funcionar ou no"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "pesquise todos os pacotes"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "modo pesquisa"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 #, fuzzy
 msgid "query/verify package(s) owning file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "pesquise o pacote ao qual <arquivo> pertence"
+msgid "query/verify package(s) in group"
+msgstr "no foi passado pacote para desinstalao"
 
-#: lib/poptQV.c:103
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) in group"
+msgid "query/verify a package file"
+msgstr "pesquise todos os pacotes"
+
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "no foi passado pacote para desinstalao"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "no foi passado pacote para desinstalao"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "pesquise todos os pacotes"
+msgid "query/verify package(s) with header identifier"
+msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 #, fuzzy
 msgid "rpm query mode"
 msgstr "modo pesquisa"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 #, fuzzy
 msgid "query a spec file"
 msgstr "pesquise todos os pacotes"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "no foi passado pacote para desinstalao"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 #, fuzzy
 msgid "query the package(s) triggered by the package"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "modo pesquisa"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 #, fuzzy
 msgid "query/verify the package(s) which require a dependency"
 msgstr "pesquise pacotes que requerem capacidade <i>"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 #, fuzzy
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "no foi passado argumento para pesquisa"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "no foi passado pacote para desinstalao"
+
+#: lib/poptQV.c:257
 #, fuzzy
 msgid "list all configuration files"
 msgstr "liste somente os arquivos de configurao (implica -l)"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 #, fuzzy
 msgid "list all documentation files"
 msgstr "instale documentao"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 #, fuzzy
 msgid "dump basic file information"
 msgstr "mostre informao do pacote"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 #, fuzzy
 msgid "list files in package"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
 # , c-format
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "use the following query format"
 msgstr "fonte de pesquisa no esperado"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "no verifique as dependncias do pacote"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verifique a assinatura do pacote"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 #, fuzzy
 msgid "generate signature"
 msgstr "gere assinatura PGP"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "no execute nenhum estgio"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:236
+#: lib/query.c:241
 #, fuzzy
 msgid "not installed "
 msgstr "no foi passado pacote para instalao"
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/query.c:299
+#: lib/query.c:304
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, fuzzy, c-format
-msgid "open of %s failed: %s\n"
-msgstr "Construo falhou.\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr ""
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "no foram passados pacotes para assinatura"
-
-#: lib/query.c:517
-#, fuzzy
-msgid "no packages\n"
-msgstr "pesquise todos os pacotes"
-
-# , c-format
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "No consegui abrir: %s\n"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
 # , c-format
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2755,28 +2853,28 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "no foi passado pacote para instalao"
@@ -2786,7 +2884,7 @@ msgstr "no foi passado pacote para instalao"
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
@@ -2798,13 +2896,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2817,51 +2915,75 @@ msgstr "No consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, fuzzy, c-format
+msgid "open of %s failed: %s\n"
+msgstr "Construo falhou.\n"
+
+# , c-format
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "No consegui abrir: %s\n"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "lista dependncias do pacote"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "instale pacote"
 
 # , c-format
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
@@ -2874,100 +2996,114 @@ msgstr "No consegui ler o arquivo spec de %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, fuzzy, c-format
 msgid "Retrieving %s\n"
 msgstr "RPM verso %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "instale pacote"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "no foram passados pacotes para assinatura"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "lista dependncias do pacote"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instale pacote"
 
 # , c-format
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
 # , c-format
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\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
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "RPM verso %s\n"
+
 # , c-format
 #: lib/rpmlead.c:56
 #, fuzzy, c-format
@@ -2983,7 +3119,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -3010,6 +3146,10 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+msgid "internal support for lua scripts."
+msgstr ""
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -3085,161 +3225,161 @@ msgstr "no foi passado pacote para desinstalao"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 # , c-format
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "instale pacote"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "instale pacote"
 
 # , c-format
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
@@ -3252,24 +3392,80 @@ msgstr "No consegui ler o arquivo spec de %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "RPM verso %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+# , c-format
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "No consegui abrir: %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3286,6 +3482,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3310,6 +3507,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3383,6 +3581,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3406,34 +3607,36 @@ msgstr ""
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "instale pacote"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "desconsidere quaisquer assinaturas MD5"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3447,11 +3650,131 @@ msgstr ""
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM verso %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "no foi passado pacote para desinstalao"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "no foram passados pacotes para assinatura"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "pesquise todos os pacotes"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "pesquise todos os pacotes"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+msgid "Failure reading repackaged package!\n"
+msgstr ""
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3460,11 +3783,15 @@ msgstr "RPM verso %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3473,7 +3800,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3481,15 +3808,40 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
-#: lib/verify.c:321
-#, c-format
-msgid "missing  %c %s"
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
 msgstr ""
 
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
+# , c-format
+#: lib/verify.c:321
+#, fuzzy, c-format
+msgid "missing   %c %s"
+msgstr "No consegui ler o arquivo spec de %s\n"
+
 #: lib/verify.c:437
 #, fuzzy, c-format
 msgid "Unsatisfied dependencies for %s: "
@@ -3520,137 +3872,137 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr ""
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr ""
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 #, fuzzy
 msgid "unexpected ]"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 #, fuzzy
 msgid "unexpected }"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr ""
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3677,179 +4029,179 @@ msgstr "pesquise todos os pacotes"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "no foi passado pacote para desinstalao"
 
 # , c-format
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3862,163 +4214,163 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
 # , c-format
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -4028,6 +4380,7 @@ msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr ""
@@ -4047,96 +4400,62 @@ msgstr ""
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "No consegui abrir o pipe tar: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "verifique a assinatura do pacote"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-# , c-format
-#: tools/rpmcache.c:528
-#, fuzzy
-msgid "don't change directories"
-msgstr "No consegui abrir: %s\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr ""
-
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
 # , c-format
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "No consegui abrir: %s\n"
@@ -4234,6 +4553,22 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr ""
+#~ "--percent somente pode ser especificado durante instalaes de pacotes"
+
+# , c-format
+#, fuzzy
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "No consegui abrir: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "instale mesmo que o pacote substitua arquivos j instalados"
+
+#, fuzzy
+#~ msgid "no packages\n"
+#~ msgstr "pesquise todos os pacotes"
+
 # "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"
@@ -4248,11 +4583,6 @@ msgstr ""
 
 # , c-format
 #, fuzzy
-#~ msgid "Finding  %s: %s\n"
-#~ msgstr "No consegui ler o arquivo spec de %s\n"
-
-# , c-format
-#, fuzzy
 #~ msgid "Failed to find %s:\n"
 #~ msgstr "No consegui abrir o pipe tar: %s\n"
 
@@ -4284,10 +4614,6 @@ msgstr ""
 #~ msgid "Old PGP signature\n"
 #~ msgstr "gere assinatura PGP"
 
-#, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "no execute nenhum estgio"
-
 # , c-format
 #, fuzzy
 #~ msgid "%s: base64 encode failed.\n"
@@ -5463,10 +5789,6 @@ msgstr ""
 #~ msgid "cannot read packages named %s for uninstall"
 #~ msgstr "no foi passado pacote para desinstalao"
 
-#, fuzzy
-#~ msgid "package has no group\n"
-#~ msgstr "no foi passado pacote para desinstalao"
-
 # , c-format
 #, fuzzy
 #~ msgid "cannot create %s"
diff --git a/po/ro.po b/po/ro.po
index bd23fb254..e9fde6940 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 msgid "Failed build dependencies:\n"
@@ -62,10 +62,12 @@ msgid "Building for target %s\n"
 msgstr ""
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr ""
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr ""
 
@@ -82,253 +84,264 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:137
+#: rpmqv.c:145
+#, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr ""
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -404,176 +417,176 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr ""
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr ""
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr ""
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr ""
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr ""
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr ""
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr ""
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -627,7 +640,7 @@ msgstr ""
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
@@ -637,122 +650,122 @@ msgstr ""
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:485
+#: build/pack.c:499
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:504
+#: build/pack.c:518
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:550
+#: build/pack.c:564
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:588
+#: build/pack.c:602
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -797,17 +810,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -827,123 +840,128 @@ msgstr ""
 msgid "line %d: Second %%files list\n"
 msgstr ""
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1022,82 +1040,87 @@ msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
 msgstr ""
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr ""
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr ""
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr ""
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr ""
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr ""
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr ""
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr ""
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr ""
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1222,18 +1245,18 @@ msgstr ""
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 msgid "don't verify package signature(s)"
 msgstr ""
 
@@ -1331,78 +1354,89 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:219
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr ""
 
@@ -1414,7 +1448,7 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr ""
 
@@ -1422,7 +1456,7 @@ msgstr ""
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 msgid "(not an OpenPGP signature)"
 msgstr ""
 
@@ -1441,7 +1475,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr ""
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
@@ -1515,863 +1549,925 @@ msgstr ""
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, c-format
+msgid "adding %d args from manifest.\n"
+msgstr ""
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr ""
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr ""
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr ""
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 msgid "send stdout to CMD"
 msgstr ""
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr ""
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 msgid "add suggested packages to transaction"
 msgstr ""
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 msgid "do not install configuration files"
 msgstr ""
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+msgid "detect file conflicts between packages"
+msgstr ""
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 msgid "don't install file security contexts"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr ""
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr ""
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 msgid "rpm checksig mode"
 msgstr ""
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr ""
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
+#: lib/poptQV.c:108
+msgid "query/verify package(s) in group"
 msgstr ""
 
-#: lib/poptQV.c:103
-msgid "query/verify package(s) in group"
+#: lib/poptQV.c:110
+msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
+#: lib/poptQV.c:113
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr ""
 
-#: lib/poptQV.c:107
-msgid "query/verify a package file"
+#: lib/poptQV.c:115
+msgid "query/verify package(s) from system HDLIST"
 msgstr ""
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr ""
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr ""
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr ""
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 msgid "query/verify a header instance"
 msgstr ""
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr ""
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+msgid "do not glob arguments"
+msgstr ""
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+msgid "do not read headers"
+msgstr ""
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 msgid "don't verify file security contexts"
 msgstr ""
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr ""
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 msgid "Unable to reload signature header\n"
 msgstr ""
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:266
+#: lib/query.c:271
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr ""
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr ""
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr ""
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr ""
-
-#: lib/query.c:535
-#, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr ""
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2468,28 +2564,28 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2499,154 +2595,183 @@ msgstr ""
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr ""
+
+#: lib/rpmgi.c:355
+#, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr ""
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+msgid "Failed dependencies:\n"
+msgstr ""
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 msgid "Upgrading packages..."
 msgstr ""
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr ""
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
 #, c-format
-msgid "found %d source and %d binary packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-msgid "Failed dependencies:\n"
+msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
+#: lib/rpminstall.c:638
+#, c-format
+msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, c-format
+msgid "\tRemoving %s:\n"
+msgstr ""
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2661,7 +2786,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2688,6 +2813,10 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+msgid "internal support for lua scripts."
+msgstr ""
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2762,174 +2891,229 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr ""
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, c-format
 msgid "Adding: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr ""
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -2946,6 +3130,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -2970,6 +3155,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3037,6 +3223,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3060,41 +3249,162 @@ msgstr ""
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+msgid "\tRepackaged package not found!.\n"
+msgstr ""
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+msgid "Failure reading repackaged package!\n"
+msgstr ""
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3103,11 +3413,15 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3116,7 +3430,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3124,13 +3438,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr ""
 
 #: lib/verify.c:437
@@ -3163,135 +3501,135 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr ""
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr ""
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr ""
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr ""
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr ""
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3316,324 +3654,324 @@ msgstr ""
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3643,6 +3981,7 @@ msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr ""
@@ -3662,91 +4001,59 @@ msgstr ""
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-msgid "don't change directories"
-msgstr ""
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 56ad6995f..02ca27468 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,10 +68,12 @@ msgid "Building for target %s\n"
 msgstr ""
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr ""
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr ""
 
@@ -87,253 +90,264 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:137
+#: rpmqv.c:145
+#, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr ""
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -409,176 +423,176 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr ""
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr ""
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr ""
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr ""
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr ""
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr ""
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr ""
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -632,7 +646,7 @@ msgstr ""
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
@@ -642,122 +656,122 @@ msgstr ""
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:485
+#: build/pack.c:499
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:504
+#: build/pack.c:518
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:550
+#: build/pack.c:564
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:588
+#: build/pack.c:602
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -802,17 +816,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -832,123 +846,128 @@ msgstr ""
 msgid "line %d: Second %%files list\n"
 msgstr ""
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1027,82 +1046,87 @@ msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
 msgstr ""
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr ""
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr ""
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr ""
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr ""
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr ""
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr ""
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr ""
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr ""
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1227,18 +1251,18 @@ msgstr ""
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 msgid "don't verify package signature(s)"
 msgstr ""
 
@@ -1336,78 +1360,89 @@ msgstr ""
 msgid " failed - "
 msgstr ""
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr ""
+
+#: lib/depends.c:219
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr ""
 
@@ -1419,7 +1454,7 @@ msgstr ""
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr ""
 
@@ -1427,7 +1462,7 @@ msgstr ""
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 msgid "(not an OpenPGP signature)"
 msgstr ""
 
@@ -1446,7 +1481,7 @@ msgstr ""
 msgid "failed to stat %s: %s\n"
 msgstr ""
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
@@ -1520,863 +1555,925 @@ msgstr ""
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, c-format
+msgid "adding %d args from manifest.\n"
+msgstr ""
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr ""
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr ""
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr ""
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 msgid "send stdout to CMD"
 msgstr ""
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 msgid "use threads for file state machine"
 msgstr ""
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr ""
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 msgid "use threads for package state machine"
 msgstr ""
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr ""
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 msgid "add suggested packages to transaction"
 msgstr ""
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 msgid "do not install configuration files"
 msgstr ""
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+msgid "detect file conflicts between packages"
+msgstr ""
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 msgid "don't install file security contexts"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr ""
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr ""
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 msgid "rpm checksig mode"
 msgstr ""
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr ""
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
+#: lib/poptQV.c:108
+msgid "query/verify package(s) in group"
 msgstr ""
 
-#: lib/poptQV.c:103
-msgid "query/verify package(s) in group"
+#: lib/poptQV.c:110
+msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
+#: lib/poptQV.c:113
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr ""
 
-#: lib/poptQV.c:107
-msgid "query/verify a package file"
+#: lib/poptQV.c:115
+msgid "query/verify package(s) from system HDLIST"
 msgstr ""
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr ""
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr ""
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr ""
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 msgid "query/verify a header instance"
 msgstr ""
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr ""
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+msgid "do not glob arguments"
+msgstr ""
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+msgid "do not read headers"
+msgstr ""
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 msgid "don't verify file security contexts"
 msgstr ""
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:956
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:857
+#: lib/psm.c:990
 #, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/psm.c:1288
+#: lib/psm.c:996
+#, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
+msgstr ""
+
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 msgid "Unable to reload signature header\n"
 msgstr ""
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:266
+#: lib/query.c:271
 msgid "package has not file owner/group lists\n"
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr ""
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr ""
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr ""
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr ""
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr ""
-
-#: lib/query.c:535
-#, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr ""
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2473,28 +2570,28 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2504,154 +2601,183 @@ msgstr ""
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr ""
+
+#: lib/rpmgi.c:355
+#, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr ""
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+msgid "Failed dependencies:\n"
+msgstr ""
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 msgid "Upgrading packages..."
 msgstr ""
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, c-format
 msgid "\tadded source package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, c-format
 msgid "package %s is not relocatable\n"
 msgstr ""
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr ""
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
 #, c-format
-msgid "found %d source and %d binary packages\n"
-msgstr ""
-
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-msgid "Failed dependencies:\n"
+msgid "%s: not an rpm package (or package manifest): %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
+#: lib/rpminstall.c:638
+#, c-format
+msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, c-format
+msgid "\tRemoving %s:\n"
+msgstr ""
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2666,7 +2792,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2693,6 +2819,10 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+msgid "internal support for lua scripts."
+msgstr ""
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2767,174 +2897,229 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr ""
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, c-format
 msgid "Adding: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr ""
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr ""
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -2951,6 +3136,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -2975,6 +3161,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3042,6 +3229,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3065,41 +3255,162 @@ msgstr ""
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+msgid "\tRepackaged package not found!.\n"
+msgstr ""
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+msgid "Failure reading repackaged package!\n"
+msgstr ""
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3108,11 +3419,15 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3121,7 +3436,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3129,13 +3444,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr ""
 
 #: lib/verify.c:437
@@ -3168,135 +3507,135 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr ""
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr ""
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr ""
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr ""
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr ""
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr ""
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr ""
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr ""
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr ""
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr ""
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3321,324 +3660,324 @@ msgstr ""
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3648,6 +3987,7 @@ msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr ""
@@ -3667,91 +4007,59 @@ msgstr ""
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-msgid "don't change directories"
-msgstr ""
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 09d79db11..b41033185 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "Date: 1999-04-03 12:20+0200\n"
 "X-Generator: KBabel 0.9.6\n"
 
@@ -64,10 +64,12 @@ msgid "Building for target %s\n"
 msgstr "óÂĎŇËÁ ÄĚŃ ĐĚÁÔĆĎŇÍŮ %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "ÚÁÄÁÎÎŮĘ ÁŇÇŐÍĹÎÔ ÎĹ Ń×ĚŃĹÔÓŃ ĐÁËĹÔĎÍ RPM\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÚÁÇĎĚĎ×ËÁ ÉÚ ĐÁËĹÔÁ\n"
 
@@ -84,156 +86,163 @@ msgstr "đÁŇÁÍĹÔŇŮ ÚÁĐŇĎÓÁ (Ó -q ÉĚÉ --query):"
 msgid "Verify options (with -V or --verify):"
 msgstr "đÁŇÁÍĹÔŇŮ ĐŇĎ×ĹŇËÉ (Ó -V ÉĚÉ --verify):"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "đÁŇÁÍĹÔŇŮ ĐŇĎ×ĹŇËÉ (Ó -V ÉĚÉ --verify):"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "đÁŇÁÍĹÔŇŮ ĐĎÄĐÉÓÉ:"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "đÁŇÁÍĹÔŇŮ ÂÁÚŮ ÄÁÎÎŮČ"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "đÁŇÁÍĹÔŇŮ ÓÂĎŇËÉ Ó [ <ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ> | <ÔÁŇ ÁŇČÉ×> | <ÉÓČĎÄÎŮĘ ĐÁËĹÔ> ]:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr "đÁŇÁÍĹÔŇŮ őÓÔÁÎĎ×ËÉ/ďÂÎĎ×ĚĹÎÉŃ/őÄÁĚĹÎÉŃ:"
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
-msgstr "ďÂÝÉĹ ĐÁŇÁÍĹÔŇŮ ÄĚŃ ×ÓĹČ ŇĹÖÉÍĎ×:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
+msgstr "ďÂÝÉĹ ĐÁŇÁÍĹÔŇŮ ÄĚŃ ×ÓĹČ ŇĹÖÉÍĎ× É ËĎÍĐĎÎĹÎÔĎ× rpm:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ×ĹŇÓÉŃ %s\n"
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 
-#: rpmqv.c:137
+#: rpmqv.c:145
+#, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "üÔŐ ĐŇĎÇŇÁÍÍŐ ÍĎÖÎĎ Ó×ĎÂĎÄÎĎ ŇÁÓĐŇĎÓÔŇÁÎŃÔŘ ÎÁ ŐÓĚĎ×ÉŃČ GNU GPL\n"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ ĐŇÉ ĎÂŇÁÂĎÔËĹ ÁŇÇŐÍĹÎÔĎ× (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ĎÓÎĎ×ÎŮČ ŇĹÖÉÍĎ×"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "ÚÁ ĎÄÉÎ ŇÁÚ ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚÎĹÎ ÔĎĚŘËĎ ĎÄÉÎ ÔÉĐ ĐŇĎ×ĹŇËÉ ÉĚÉ ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ĆĚÁÇÉ ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ĆĎŇÍÁÔ ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ÉÓÔĎŢÎÉË ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "ĐŇÉÎŐÄÉÔĹĚŘÎŮÍÉ ÍĎÇŐÔ ÂŮÔŘ ÔĎĚŘËĎ ŐÓÔÁÎĎ×ËÁ, ĎÂÎĎ×ĚĹÎÉĹ, ŐÄÁĚĹÎÉĹ ÉÓČĎÄÎÉËĎ× "
 "É ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "ĆÁĘĚŮ ÍĎÇŐÔ ÂŮÔŘ ĐĹŇĹÍĹÝĹÎŮ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "×ÁŇÉÁÎÔŮ --relocate É --excludepath ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ "
 "ÎĎ×ŮČ ĐÁËĹÔĎ×"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "×ÁŇÉÁÎÔ --prefix ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÎĎ×ŮČ ĐÁËĹÔĎ×"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --prefix ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ĐÁŇÁÍĹÔŇĎ× --excludedocs ÉĚÉ --"
 "includedocs"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -241,7 +250,7 @@ msgstr ""
 "ĐÁŇÁÍĹÔŇŮ ÚÁĐŇĹÔÁ ÓĂĹÎÁŇÉĹ× ÍĎÇŐÔ ÂŮÔŘ ŐËÁÚÁÎŮ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ "
 "ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -249,7 +258,7 @@ msgstr ""
 "ĐÁŇÁÍĹÔŇŮ ÚÁĐŇĹÔÁ ÔŇÉÇÇĹŇĎ× ÍĎÇŐÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ "
 "ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ(Ď×)"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -257,14 +266,14 @@ msgstr ""
 "--nodeps ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ, ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É ĐŇĎ×ĹŇËÉ "
 "ĐÁËĹÔĎ×"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É ÓÂĎŇËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -272,81 +281,86 @@ msgstr ""
 "--root (-r) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ, ÚÁĐŇĎÓÁČ "
 "ĐÁËĹÔÁ É ĐĹŇĹÓÔŇĎĹÎÉÉ ÂÁÚŮ ÄÁÎÎŮČ"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --root (-r) ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "ÎĹÔ ĆÁĘĚĎ× ÄĚŃ ĐĎÄĐÉÓÉ\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "ÎĹÔ ÄĎÓÔŐĐÁ Ë ĆÁĘĚŐ %s\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp ÎĹ ÎÁĘÄĹÎ: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "÷×ĹÄÉÔĹ ËĚŔŢĹ×ŐŔ ĆŇÁÚŐ: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "îĹ×ĹŇÎÁŃ ËĚŔŢĹ×ÁŃ ĆŇÁÚÁ\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "ëĚŔŢĹ×ÁŃ ĆŇÁÚÁ ĐŇÉÎŃÔÁ.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ %%_signature × ÍÁËŇĎĆÁĘĚĹ.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ ĐÁËĹÔĎ×"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "ÚÁĐŐÓË ÎĹ ŐÄÁĚÓŃ\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĹŇĹÓÂĎŇËÉ"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "ÎĹ ÚÁÄÁÎ ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "ÎĹ ÚÁÄÁÎŮ tar-ĆÁĘĚŮ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÄĚŃ ×ĹŇÉĆÉËÁĂÉÉ"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ×ŇĹÍĹÎÎŮĘ ĆÁĘĚ.\n"
 
@@ -425,169 +439,169 @@ msgstr "&& É || ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ ÄĚŃ ÓÔŇĎË\n"
 msgid "syntax error in expression\n"
 msgstr "ÓÉÎÔÁËÓÉŢĹÓËÁŃ ĎŰÉÂËÁ × ×ŮŇÁÖĹÎÉÉ\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "ďŰÉÂËÁ TIMECHECK: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "ďÔÓŐÔÓÔ×ŐĹÔ '(' × %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ')' × %s(%s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "îĹ×ĹŇÎŮĘ ÔĎËĹÎ %s: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "ďÔÓŐÔÓÔ×ŐĹÔ %s × %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "îĹ ĐŇĎÂĹĚ ÓĚĹÄŐĹÔ ĐĎÓĚĹ %s(): %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "îĹ×ĹŇÎŮĘ ÓÉÎÔÁËÓÉÓ: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "îĹ×ĹŇÎŮĹ ĐŇÁ×Á: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "îĹ×ĹŇÎŮĹ ĐŇÁ×Á ÎÁ ËÁÔÁĚĎÇ %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "îĹĎÂŮŢÎÁŃ ÄĚÉÎÁ locale: \"%.*s\" × %%lang(%s)\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "äŐÂĚÉËÁÔ locale %.*s × %%lang(%s)\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "ěÉÍÉÔ ÄĚŃ %%docdir ĐŇĹ×ŮŰĹÎ\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "ôĎĚŘËĎ ĎÄÉÎ ÁŇÇŐÍĹÎÔ ÄĚŃ %%docdir\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "ä×Á ĆÁĘĚÁ × ĎÄÎĎĘ ÓÔŇĎËĹ: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "ćÁĘĚ ÄĎĚÖĹÎ ÎÁŢÉÎÁÔŘÓŃ Ó \"/\": %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "îĹĚŘÚŃ ÓÍĹŰÉ×ÁÔŘ ÓĐĹĂ. %%doc Ó ÄŇŐÇÉÍÉ ĆĎŇÍÁÍÉ: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "ćÁĘĚ ŐËÁÚÁÎ Ä×ÁÖÄŮ: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "óÉÍ×ĎĚÉŢĹÓËÁŃ ÓÓŮĚËÁ ŐËÁÚŮ×ÁĹÔ ÎÁ BuildRoot: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "ćÁĘĚ ÎĹ ÓĎĎÔ×ĹÔÓÔŐĹÔ ĐŇĹĆÉËÓŐ (%s): %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "ćÁĘĚ ÎĹ ÎÁĘÄĹÎ: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: ĎŰÉÂËÁ ŢÔĹÎÉŃ ×Ď ×ŇĹÍŃ ÉÍĐĎŇÔÉŇĎ×ÁÎÉŃ.\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: ÜÔĎ ÎĹ ĎÔËŇŮÔŮĘ ËĚŔŢ.\n"
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: ĎŰÉÂËÁ ŢÔĹÎÉŃ ×Ď ×ŇĹÍŃ ÉÍĐĎŇÔÉŇĎ×ÁÎÉŃ.\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "ćÁĘĚ ÄĎĚÖĹÎ ÎÁŢÉÎÁÔŘÓŃ Ó \"/\": %s\n"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob ÎĹ ŇÁÚŇĹŰÁŔÔÓŃ: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "ćÁĘĚ ÎĹ ÎÁĘÄĹÎ: %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ %%files %s: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "ÓÔŇĎËÁ: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "îĹ×ĹŇÎŮĘ ĆÁĘĚ %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "îĹ×ĹŇÎÁŃ ĐÁŇÁ ×ĚÁÄĹĚĹĂ/ÇŇŐĐĐÁ: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "đŇĎ×ĹŇËÁ ÎÁ ÎĹŐĐÁËĎ×ÁÎÎŮĘ(Ĺ) ĆÁĘĚ(Ů): %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -596,7 +610,7 @@ msgstr ""
 "ďÂÎÁŇŐÖĹÎ(Ů) ŐÓÔÁÎĎ×ĚĹÎÎŮĘ(Ĺ) (ÎĎ ÎĹ ŐĐÁËĎ×ÁÎÎŮĘ(Ĺ)) ĆÁĘĚ(Ů):\n"
 "%s"
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ďÂŇÁÂÁÔŮ×ÁŔÔÓŃ ĆÁĘĚŮ: %s-%s-%s\n"
@@ -650,7 +664,7 @@ msgstr "cpio_copy: ĎŰÉÂËÁ ÚÁĐÉÓÉ: %s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy: ĎŰÉÂËÁ ŢÔĹÎÉŃ: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ PreIn: %s\n"
@@ -660,122 +674,122 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ PreIn: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ PreUn: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ PostIn: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ PostUn: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ VerifyScript: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ Trigger script: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: ĎÔËŇŮÔÉĹ %s: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ŢÔĹÎÉĹ %s: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: ĎŰÉÂËÁ Fseek: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s  ÎĹ Ń×ĚŃĹÔÓŃ ĐÁËĹÔĎÍ RPM\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ŢÉÔÁĹÔÓŃ ÚÁÇĎĚĎ×ĎË ÉÚ %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 msgid "Unable to create immutable header region.\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐĎÍĹÓÔÉÔŘ ÚÁÇĎĚĎ×ĎË × ÎĹŇĐĹŇŮ×ÎŐŔ ĎÂĚÁÓÔŘ ĐÁÍŃÔÉ.\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 msgid "Unable to write temp header\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ×ŇĹÍĹÎÎŮĘ ÚÁÇĎĚĎ×ĎË\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "îĹ×ĹŇÎŮĹ ÄÁÎÎŮĹ CSA\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 msgid "Unable to write final header\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ĎËĎÎŢÁÔĹĚŘÎŮĘ ÚÁÇĎĚĎ×ĎË\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 msgid "Unable to reload signature header.\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐĹŇĹÚÁÇŇŐÚÉÔŘ ÚÁÇĎĚĎ×ĎË ĐĎÄĐÉÓÉ.\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ĐÁËĹÔ: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĂĹĚŘ ĐĎÄĐÉÓÉ %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÚÁÇĎĚĎ×ĎË ÉÚ %s: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ÚÁÇĎĚĎ×ĎË × %s: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÓĎÄĹŇÖÉÍĎĹ ÉÚ %s: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐÉÓÁÔŘ ÓĎÄĹŇÖÉÍĎĹ × %s: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁĐÉÓÁÎ: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ ÉÍŃ ĆÁĘĚÁ ÄĚŃ ĐÁËĹÔÁ %s: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
@@ -820,17 +834,17 @@ msgstr "ÎĹÔ ĎĐÉÓÁÎÉŃ × %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "ÓÔŇĎËÁ %d: ďŰÉÂËÁ ÁÎÁĚÉÚÁ %%description: %s\n"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎŮĘ ĐÁŇÁÍĹÔŇ %s: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "ÓÔŇĎËÁ %d: óĚÉŰËĎÍ ÍÎĎÇĎ ÉÍĹÎ: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "ÓÔŇĎËÁ %d: đÁËĹÔ ÎĹ ÓŐÝĹÓÔ×ŐĹÔ: %s\n"
@@ -850,123 +864,128 @@ msgstr "ÓÔŇĎËÁ %d: ďŰÉÂËÁ ŇÁÚÂĎŇÁ %%files: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "ÓÔŇĎËÁ %d: ÷ÔĎŇĎĘ ÓĐÉÓĎË %%files\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "áŇČÉÔĹËÔŐŇÁ ÉÓËĚŔŢĹÎÁ: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "áŇČÉÔĹËÔŐŇÁ ÎĹ ×ËĚŔŢĹÎÁ: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "ďó ÉÓËĚŔŢĹÎÁ: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "ďó ÎĹ ×ËĚŔŢĹÎÁ: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "đĎĚĹ %s ĎÂŃÚÁÎĎ ĐŇÉÓŐÔÓÔ×Ď×ÁÔŘ × ĐÁËĹÔĹ: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "đĎ×ÔĎŇŃŔÝÉĹÓŃ ÚÁĐÉÓÉ %s × ĐÁËĹÔĹ: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĐÉËÔĎÇŇÁÍÍŐ %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ĐÉËÔĎÇŇÁÍÍŐ %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "îĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ ĐÉËÔĎÇŇÁÍÍŮ: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "ÓÔŇĎËÁ %d: ńŇĚŮË ÔŇĹÂŐĹÔ ÔĎĚŘËĎ ĎÄÉÎ ÁŇÇŐÍĹÎÔ: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎŮĘ ÔÜÇ: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "ÓÔŇĎËÁ %d: đŐÓÔĎĘ ÔÜÇ: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "ÓÔŇĎËÁ %d: îĹÄĎĐŐÓÔÉÍŮĘ ÓÉÍ×ĎĚ '-' × %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot ÎĹ ÍĎÖĹÔ ÂŮÔŘ \"/\": %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "ÓÔŇĎËÁ %d: đŇĹĆÉËÓ ÎĹ ÍĎÖĹÔ ÚÁËÁÎŢÉ×ÁÔŘÓŃ ÎÁ \"/\": %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "ÓÔŇĎËÁ %d: Docdir ÄĎĚÖĹÎ ÎÁŢÉÎÁÔŘÓŃ Ó '/': %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "ÓÔŇĎËÁ %d: đĎĚĹ Epoch/Serial ÄĎĚÖÎĎ ÂŮÔŘ ŢÉÓĚĎÍ: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎĎĹ ŢÉÓĚĎ %s: ĎĐŇĹÄĹĚŃĹÔ: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "ÓÔŇĎËÁ %d: îĹ×ĹŇÎŮĘ ĆĎŇÍÁÔ BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ: îĹÉÚ×ĹÓÔÎŮĘ ŃŇĚŮË %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ ĐÁËĹÔÁ: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "đÁËĹÔ ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "ÓÔŇĎËÁ %d: îĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "ćÁĘĚ spec ÎĹ ÍĎÖĹÔ ÉÓĐĎĚŘÚĎ×ÁÔŘ BuildRoot\n"
 
@@ -1047,82 +1066,87 @@ msgstr ""
 "ÓÔŇĎËÁ %d: ôĎËĹÎŮ ÚÁ×ÉÓÉÍĎÓÔĹĘ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó ÂŐË×Ů, ĂÉĆŇŮ, '_' ÉĚÉ "
 "'/': %s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "ÓÔŇĎËÁ %d: éÍĹÎÁ ĆÁĘĚĎ× ÎĹ ŇÁÚŇĹŰÁŔÔÓŃ: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "ÓÔŇĎËÁ %d: ÷ĹŇÓÉÉ × ÉÍĹÎÁČ ĆÁĘĚĎ× ÎĹÄĎĐŐÓÔÉÍŮ: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "ÓÔŇĎËÁ %d: ôŇĹÂŐĹÔÓŃ ×ĹŇÓÉŃ: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "ÓÔŇĎËÁ %d: ÔŇÉÇÇĹŇŮ ÄĎĚÖÎŮ ÓĎÄĹŇÖÁÔŘ --: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "ÓÔŇĎËÁ %d: ďŰÉÂËÁ ÁÎÁĚÉÚÁ %s: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "ÓÔŇĎËÁ %d: đŇĎÇŇÁÍÍŮ × ÓĂĹÎÁŇÉŃČ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó '/': %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "ÓÔŇĎËÁ %d: đŇĎÇŇÁÍÍŮ × ÓĂĹÎÁŇÉŃČ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó '/': %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "ÓÔŇĎËÁ %d: ÷ÔĎŇĎĹ %s\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "ÓÔŇĎËÁ %d: ďŰÉÂËÁ ÁÎÁĚÉÚÁ %%description: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "ÓÔŇĎËÁ %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "îĹÚÁËŇŮÔŮĘ %%if\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean ËĎÄ ×ĎÚ×ŇÁÔÁ: %d\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: îÁĘÄĹÎ %%else ÂĹÚ %%if\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: îÁĘÄĹÎ %%endif ÂĹÚ %%if\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "ÎĹ×ĹŇÎĎĹ ĎÂßŃ×ĚĹÎÉĹ %%include\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "îĹ ÎÁĘÄĹÎŮ ÓĎ×ÍĹÓÔÉÍŮĹ ÁŇČÉÔĹËÔŐŇŮ ÄĚŃ ÓÂĎŇËÉ.\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "đÁËĹÔ ÎĹ ÉÍĹĹÔ %%description: %s\n"
@@ -1258,18 +1282,18 @@ msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 "ÓĎÚÄÁÔŘ ÚÁÇĎĚĎ×ĎË(ËÉ) ĐÁËĹÔÁ, ÓĎ×ÍĹÓÔÉÍŮĹ Ó (ŐÓÔÁŇĹ×ŰÉÍÉ)  ĆĎŇÍÁÔÁÍÉ rpm[23]"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 msgid "don't verify package digest(s)"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÄÁĘÄÖĹÓÔ ĐÁËĹÔÁ(Ď×)"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 msgid "don't verify database header(s) when retrieved"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁÇĎĚĎ×ËÉ, ÉÚ×ĚĹËÁĹÍŮĹ ÉÚ ÂÁÚŮ ÄÁÎÎŮČ"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 msgid "don't verify package signature(s)"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐĎÄĐÉÓŘ(É) × ĐÁËĹÔĹ(ÁČ)"
 
@@ -1367,52 +1391,63 @@ msgstr "ćÁĘĚ ÁŇČÉ×Á ÎĹ ÎÁĘÄĹÎ × ÚÁÇĎĚĎ×ËĹ ĐÁËĹÔÁ"
 msgid " failed - "
 msgstr "ÎĹ ŐÄÁĚĎÓŘ - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "ĐÁËĹÔ %s ŐÖĹ ÂŮĚ ÄĎÂÁ×ĚĹÎ, ÚÁÍĹÎŃĹÔÓŃ %s\n"
+
+#: lib/depends.c:219
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "ĐÁËĹÔ %s ŐÖĹ ÂŮĚ ÄĎÂÁ×ĚĹÎ, ÚÁÍĹÎŃĹÔÓŃ %s\n"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr "(ËÜŰÉŇĎ×ÁÎ)"
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr "(rpmrc provides)"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr "(rpmlib provides)"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr "(db files)"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr "(db provides)"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 msgid "(db package)"
 msgstr "(db package)"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ÉÇÎĎŇÉŇĎ×ÁÔŘ ÚÁ×ÉÓÉÍĎÓÔ(É) ÉÍŁÎ ĐÁËĹÔÁ(Ď×) [%d]\t%s -> %s\n"
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ %s \"%s\" ÉÚ ÓĎŇÔÉŇĎ×ÁÎÎŮČ Ó×ŃÚĹĘ.\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "========== ÚÁĐÉÓŘ ŐĐĎŇŃÄĎŢĹÎÎŮČ ÚÁ×ÉÓÉÍĎÓÔĹĘ\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
@@ -1420,27 +1455,27 @@ msgstr ""
 "========== ÓĎŇÔÉŇĎ×ËÁ ĐÁËĹÔĎ× (ĎŢĹŇĹÄÎĎÓÔŘ, #predecessors, #succesors, "
 "ÄĹŇĹ×Ď, ÇĚŐÂÉÎÁ)\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== ÔĎĚŘËĎ ĐĎÓĚĹÄĎ×ÁÔĹĚÉ (× ĐĎŇŃÄËĹ ĐŇĹÄÓÔÁ×ĚĹÎÉŃ)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "ăéëě:\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== ĐŇĎÄĎĚÖĹÎÉĹ ŐĐĎŇŃÄĎŢĹÎÉŃ ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "ĎŰÉÂËÁ rpmtsOrder, ĎÓÔÁĚĎÓŘ %d ÜĚĹÍĹÎÔĎ×\n"
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(ÎĹ ŢÉÓĚĎ)"
 
@@ -1452,7 +1487,7 @@ msgstr "(ÎĹ base64)"
 msgid "(invalid type)"
 msgstr "(ÎĹĐŇÁ×ÉĚŘÎŮĘ ÔÉĐ)"
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr "(not a blob)"
 
@@ -1461,7 +1496,7 @@ msgstr "(not a blob)"
 msgid "(invalid xml type)"
 msgstr "(ÎĹĐŇÁ×ÉĚŘÎŮĘ ÔÉĐ)"
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 msgid "(not an OpenPGP signature)"
 msgstr "(ÎĹ ĐĎÄĐÉÓŘ ĆĎŇÍÁÔÁ OpenPGP)"
 
@@ -1480,7 +1515,7 @@ msgstr "mntctl() ÎĹ ×ĎÚ×ŇÁÔÉĚ ÚÎÁŢĹÎÉĹ ŇÁÚÍĹŇÁ fugger: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÉÎĆĎŇÍÁĂÉŔ Ď %s: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
@@ -1555,261 +1590,306 @@ msgstr "%s ÎĹ×ĎÚÍĎÖÎĎ ŐÄÁĚÉÔŘ %s: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s ÓĎÚÄÁÎ ËÁË %s\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ × ÉÎÄĹËÓ %s\n"
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %%%s %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐÉÓÁÔŘ × %%%s %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ ×ŇĹÍĹÎÎĎÇĎ ĆÁĘĚÁ %s\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, fuzzy, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 "ÔĎĚŘËĎ ĐĎÄĐÉÓÉ ×ĹŇÓÉÉ 3 ÍĎÇŐÔ ÂŮÔŘ ĐŇĎ×ĹŇĹÎŮ, ĐŇĎĐŐÓËÁĹÔÓŃ ĐĎÄĐÉÓŘ ×ĹŇÓÉÉ %u"
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ĐÁËĹÔŮ ×ĹŇÓÉÉ 1 ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ ÜÔĎĘ ×ĹŇÓÉĹĘ RPM\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ÜÔÁ ×ĹŇÓÉŃ RPM ĐĎÄÄĹŇÖÉ×ÁĹÔ ÔĎĚŘËĎ ĐÁËĹÔŮ ×ĹŇÓÉÉ <= 4\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: ĎŰÉÂËÁ rpmReadSignature\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: đĎÄĐÉÓŘ ÎĹÄĎÓÔŐĐÎÁ\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: ĎŰÉÂËÁ headerRead\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ĎŰÉÂËÁ Fread: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "ÎĹ ÍĹÎŃÔŘ ËÁÔÁĚĎÇÉ"
+
+#: lib/poptALL.c:231
+#, fuzzy
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr "ÎĹ ÚÁĐŇÁŰÉ×ÁÔŘ ÉÎĆĎŇÍÁĂÉŔ Ď ĆÁĘĚÁČ"
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+#, fuzzy
+msgid "FTS_XDEV: don't cross devices"
+msgstr "ÎĹ ĐĹŇĹÓĹËÁÔŘ ÇŇÁÎÉĂŮ ĆÁĘĚĎ×ŮČ ÓÉÓÔĹÍ"
+
+#: lib/poptALL.c:239
+#, fuzzy
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr "ÎĹ ×ĎÚ×ŇÁÝÁÔŘ ÉÎĆĎŇÍÁĂÉŔ"
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr "ĐŇĹĎĐŇĹÄĹĚÉÔŘ MACRO ÓĎ ÚÎÁŢĹÎÉĹÍ EXPR"
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr "ĎĐŇĹÄĹĚÉÔŘ MACRO ÓĎ ÚÎÁŢĹÎÉĹÍ EXPR"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 msgid "print macro expansion of EXPR"
 msgstr "×Ů×ĹÓÔÉ ÚÎÁŢĹÎÉĹ ÍÁËŇĎÓÁ EXPR"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <FILE:...> ×ÍĹÓÔĎ ĆÁĘĚÁ(Ď×) ĐĎ ŐÍĎĚŢÁÎÉŔ"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "ÚÁĐŇĹÔÉÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÉĹ libio(3) API"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 msgid "send stdout to CMD"
 msgstr "ĐĎÓĚÁÔŘ ÓÔÁÎÄÁŇÔÎŮĘ ×Ů×ĎÄ × CMD"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 msgid "use ROOT as top level directory"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ ROOT ËÁË ËĎŇÎĹ×ĎĘ ËÁÔÁĚĎÇ"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "ĎÔĎÂŇÁÚÉÔŘ ÉÚ×ĹÓÔÎŮĹ ËĚŔŢÉ ÚÁĐŇĎÓÁ"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "ĐĎËÁÚÁÔŘ ÔĹËŐÝĹĹ ÚÎÁŢĹÎÉĹ rpmrc É ÍÁËŇĎÓĎ×"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "×Ů×ĎÄÉÔŘ ÍÉÎÉÍŐÍ ÓĎĎÂÝĹÎÉĘ"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "×Ů×ĎÄÉÔŘ ÂĎĚĹĹ ÄĹÔÁĚŘÎŮĹ ÓĎĎÂÝĹÎÉŃ"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "×Ů×ĹÓÔÉ ÎĎÍĹŇ ×ĹŇÓÉÉ ÜÔĎĘ ĐŇÇŇÁÍÍŮ"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr "ĎÔĚÁÄËÁ ÍÁŰÉÎŮ ÓĎÓÔĎŃÎÉŃ ĐŇÉÓĎĹÄÉÎĹÎÎŮČ ĆÁĘĚĎ× "
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "ĎÔĚÁÄËÁ ÍÁŰÉÎŮ ÓĎÓÔĎŃÎÉŃ ĐŇÉÓĎĹÄÉÎĹÎÎŮČ ĆÁĘĚĎ× "
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "ĎÔĚÁÄËÁ ĐŇĎÔĎËĎĚÁ ĐĎÔĎËÁ ÄÁÎÎŮČ"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr "ĎÔĚÁÄËÁ ĎÂŇÁÂĎÔËÉ ĐÁŇÁÍĹÔŇĎ×/ÁŇÇŐÍĹÎÔĎ×"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr "ĎÔĚÁÄËÁ ÍÁŰÉÎŮ ÓĎÓÔĎŃÎÉŃ ĐÁËĹÔĎ×"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "ĎÔĚÁÄËÁ ÍÁŰÉÎŮ ÓĎÓÔĎŃÎÉŃ ĐÁËĹÔĎ×"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "ĎÔĚÁÄËÁ ĐŇĎĂĹÓÓÁ ××ĎÄÁ/×Ů×ĎÄÁ rpmio"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "ĎÔĚÁÄËÁ ĎÂŇÁÂĎÔËÉ URL ËÜŰ"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: ÔÁÂĚÉĂÁ ĐÁŇÁÍĹÔŇĎ× ÎĹĐŇÁ×ÉĚŘÎĎ ÎÁÓÔŇĎĹÎÁ (%d)\n"
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "ÉÓËĚŔŢĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÓĎÄĹŇÖÁÔŘ ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÉÍĹÔŘ / ĐĎÓĚĹ ="
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr "ĎÔËÁÔ ÔŇĹÂŐĹÔ ÁŇÇŐÍĹÎÔ ×ŇĹÍĹÎÉ"
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr "ÎĹĐŇÁ×ÉĚŘÎŮĘ ĆĎŇÍÁÔ ×ŇĹÍĹÎÉ ĎÔËÁÔÁ"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 msgid "add suggested packages to transaction"
 msgstr "ÄĎÂÁ×ÉÔŘ ĐŇĹÄĚĎÖĹÎÎŮĹ ĐÁËĹÔŮ × ÔŇÁÎÚÁËĂÉŔ"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ×ÓĹ ĆÁĘĚŮ, ÄÁÖĹ ËĎÎĆÉÇŐŇÁĂÉĎÎÎŮĹ, ËĎÔĎŇŮĹ ÍĎÇĚÉ ÂŮ ÂŮÔŘ "
 "ĐŇĎĐŐÝĹÎŮ"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1817,154 +1897,163 @@ msgstr ""
 "ŐÄÁĚÉÔŘ ×ÓĹ ĐÁËĹÔŮ, ÓĎ×ĐÁÄÁŔÝÉĹ Ó <ĐÁËĹÔ> (ĎÂŮŢÎĎ, ĹÓĚÉ <ĐÁËĹÔ> "
 "ÓĎĎÔ×ĹÔÓÔ×ŐĹÔ ÎĹÓËĎĚŘËÉÍ ĐÁËĹÔÁÍ, ÇĹÎĹŇÉŇŐĹÔÓŃ ĎŰÉÂËÁ)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÓĂĹÎÁŇÉĹ× ĐÁËĹÔÁ(Ď×)"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ × ÎĹĐĹŇĹÍĹÝÁĹÍĎÍ ĐÁËĹÔĹ"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr "ÓĎČŇÁÎÉÔŘ × ĐĎÄËÁÔÁĚĎÇĹ ĐĎÄĚĹÖÁÝÉĹ ŐÄÁĚĹÎÉŔ ĆÁĘĚŮ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "ŐÄÁĚÉÔŘ (ÄĹÉÎÓÔÁĚĚÉŇĎ×ÁÔŘ) ĐÁËĹÔ"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<ĐÁËĹÔ>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "ĐĎËÁÚÁÔŘ ×ÓĹ ĆÁĘĚŮ ËĎÎĆÉÇŐŇÁĂÉÉ"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "ÎĹ ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ÄĎËŐÍĹÎÔÁĂÉŔ"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ × ĐŐÔÉ <ĐŐÔŘ>"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<ĐŐÔŘ>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ × ÎĹĐĹŇĹÍĹÝÁĹÍĎÍ ĐÁËĹÔĹ"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "ÓĎËŇÁÝĹÎÉĹ ÄĚŃ --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "ĎÂÎĎ×ÉÔŘ ĐÁËĹÔ(Ů) ĹÓĚÉ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<ĆÁĘĚ ĐÁËĹÔÁ>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "×Ů×ĎÄÉÔŘ \"#\" ĐĎ ÍĹŇĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ (ČĎŇĎŰĎ Ó -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÁŇČÉÔĹËÔŐŇŐ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĎĐĹŇÁĂÉĎÎÎŐŔ ÓÉÓÔĹÍŐ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÄÉÓËĎ×ĎĹ ĐŇĎÓÔŇÁÎÓÔ×Ď ĐĹŇĹÄ ŐÓÔÁÎĎ×ËĎĘ"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "ŐÓÔÁÎĎ×ÉÔŘ ÄĎËŐÍĹÎÔÁĂÉŔ"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 msgid "install package(s)"
 msgstr "ŐÓÔÁÎĎ×ÉÔŘ ĐÁËĹÔ(Ů)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "ĎÂÎĎ×ÉÔŘ ÂÁÚŐ ÄÁÎÎŮČ, ÎĎ ÎĹ ÍĎÄÉĆÉĂÉŇĎ×ÁÔŘ ĆÁĘĚĎ×ŐŔ ÓÉÓÔĹÍŐ"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ÎÁ ËĎÎÔŇĎĚŘÎŐŔ ÓŐÍÍŐ MD5"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "ĐĎËÁÚÁÔŘ ×ÓĹ ĆÁĘĚŮ ËĎÎĆÉÇŐŇÁĂÉÉ"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ÎĹ ÍĹÎŃÔŘ ĐĎŇŃÄĎË ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔĎ× ÄĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÚÁ×ÉÓÉÍĎÓÔĹĘ"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "ÎĹ ĐŇĹÄĚÁÇÁÔŘ ŇÁÚŇĹŰĹÎÉĹ ĐŇĎĐŐÝĹÎÎĎĘ(ŮČ) ÚÁ×ÉÓÉÍĎÓÔÉ(ĹĘ)"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ  %%pre ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%post ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%preun ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%postun ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÔŇÉÇÇĹŇ-ÓĂĹÎÁŇÉĹ×, ×Ú×ĹÄĹÎÎŮČ ÜÔÉÍ ĐÁËĹÔĎÍ"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerprein ÓĂĹÎÁŇÉĹ×"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerin ÓĂĹÎÁŇÉĹ×"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerun ÓĂĹÎÁŇÉĹ×"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerpostun ÓĂĹÎÁŇÉĹ×"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1972,461 +2061,478 @@ msgstr ""
 "ĎÔËÁÔ ÎÁ ÂĎĚĹĹ ÓÔÁŇŐŔ ×ĹŇÓÉŔ ĐÁËĹÔÁ (--force ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ÄĹĚÁĹÔ ÜÔĎ "
 "Á×ÔĎÍÁÔÉŢĹÓËÉ)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "×Ů×ĎÄÉÔŘ ĐŇĎĂĹÎÔ ÇĎÔĎ×ÎĎÓÔÉ ĐĎ ÍĹŇĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĐÁËĹÔ × <ËÁÔÁĚĎÇ>, ĹÓĚÉ ĐÁËĹÔ ÜÔĎ ĐĎÚ×ĎĚŃĹÔ"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<ËÁÔÁĚĎÇ>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ ÉÚ ĐŐÔÉ <old> × <new>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<old>=<new>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr "ÓĎČŇÁÎÉÔŘ ĐĎÄĚĹÖÁÝÉĹ ŐÄÁĚĹÎÉŔ ĆÁĘĚŮ × ÎĎ×ĎÍ ĐÁËĹÔĹ"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ, ÄÁÖĹ ĹÓĚÉ ĐÁËĹÔ ĐĹŇĹĐÉŰĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎÎŮĹ ĆÁĘĚŮ"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "ĐĹŇĹŐÓÔÁÎĎ×ÉÔŘ, ĹÓĚÉ ĐÁËĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 "ŐÄÁĚÉÔŘ ÎĎ×ŮĘ(Ĺ) ĐÁËĹÔ(Ů), ĐĹŇĹŐÓÔÁÎĎ×ÉÔŘ ÓÔÁŇŮĘ(Ĺ) ĐÁËĹÔ(Ů), ĎÂŇÁÔÎĎ ÎÁ "
 "ŐËÁÚÁÎÎŐŔ ÄÁÔŐ"
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr "<ÄÁÔÁ>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "ÎĹ ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ, Á ÔĎĚŘËĎ ÓĎĎÂÝÉÔŘ, ŐÄÁÓÔÓŃ ĚÉ ŐÓÔÁÎĎ×ËÁ"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "ĎÂÎĎ×ÉÔŘ ĐÁËĹÔ(Ů)"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ×ÓĹ ĐÁËĹÔŮ"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 msgid "rpm checksig mode"
 msgstr "ŇĹÖÉÍ ĐŇĎ×ĹŇËÉ ĐĎÄĐÉÓÉ"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ, ËĎÔĎŇĎÍŐ ĐŇÉÎÁÄĚĹÖÉÔ ĆÁĘĚ"
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
-msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů) ĐĎ ÉÄĹÎÔÉĆÉËÁÔĎŇŐ ĆÁĘĚÁ"
-
-#: lib/poptQV.c:103
+#: lib/poptQV.c:108
 msgid "query/verify package(s) in group"
 msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔŮ × ÇŇŐĐĐĹ"
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
-msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů), ĐĎ ÉÄĹÎÔÉĆÉËÁÔĎŇŐ ÚÁÇĎĚĎ×ËÁ"
-
-#: lib/poptQV.c:107
+#: lib/poptQV.c:110
 msgid "query/verify a package file"
 msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĆÁĘĚ ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
+msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů) ÉÚ ÔŇÁÎÚÁËĂÉÉ ŐÓÔÁÎĎ×ËÉ"
+
+#: lib/poptQV.c:115
+#, fuzzy
+msgid "query/verify package(s) from system HDLIST"
+msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů) ÉÚ ÔŇÁÎÚÁËĂÉÉ ŐÓÔÁÎĎ×ËÉ"
+
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů) ĐĎ ÉÄĹÎÔÉĆÉËÁÔĎŇŐ ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů), ĐĎ ÉÄĹÎÔÉĆÉËÁÔĎŇŐ ÚÁÇĎĚĎ×ËÁ"
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů) ĐĎ ÉÄĹÎÔÉĆÉËÁÔĎŇŐ ĆÁĘĚÁ"
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "ŇĹÖÉÍ ÚÁĐŇĎÓÁ rpm"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 msgid "query/verify a header instance"
 msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ÚÁÇĎĚĎ×ĎË"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "ÚÁĐŇĎÓÉÔŘ ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů) ÉÚ ÔŇÁÎÚÁËĂÉÉ ŐÓÔÁÎĎ×ËÉ"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "ÚÁĐŇĎÓÉÔŘ ĐÁËĹÔŮ Ó ÔŇÉÇÇĹŇ-ÓĂĹÎÁŇÉŃÍÉ ÎÁ ĐÁËĹÔ"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "ŇĹÖÉÍ ĐŇĎ×ĹŇËÉ rpm"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "ÎÁĘÔÉ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔŮ, ÔŇĹÂŐŔÝÉĹ ÓĹŇ×ÉÓ"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "ÎÁĘÔÉ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔŮ, ĐŇĹÄĎÓÔÁ×ĚŃŔÝÉĹ ÓĹŇ×ÉÓ"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ ÚÁÇĎĚĎ×ĎË × 0x%x\n"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "ĐĎËÁÚÁÔŘ ×ÓĹ ĆÁĘĚŮ ËĎÎĆÉÇŐŇÁĂÉÉ"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "ĐĎËÁÚÁÔŘ ×ÓĹ ĆÁĘĚŮ ÄĎËŐÍĹÎÔÁĂÉÉ"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "ĐĎËÁÚÁÔŘ ĎÓÎĎ×ÎŐŔ ÉÎĆĎŇÍÁĂÉŔ Ď ĆÁĘĚĹ"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "ĐĎËÁÚÁÔŘ ÓĐÉÓĎË ĆÁĘĚĎ× ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ %%ghost"
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ %%license"
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ %%readme"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "ÉÓĐĎĚŘÚŐĘÔĹ ÓĚĹÄŐŔÝÉĘ ĆĎŇÍÁÔ ÚÁĐŇĎÓÁ"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "ÚÁÍĹÎÉÔŘ ÓĹËĂÉÉ i18n × ĆÁĘĚĹ ÓĐĹĂÉĆÉËÁĂÉÉ"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "ĐĎËÁÚÁÔŘ ÓĎÓÔĎŃÎÉĹ ĐĹŇĹŢÉÓĚĹÎÎŮČ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ŇÁÚÍĹŇ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐŐÔŘ ÓÉÍ×ĎĚÉŢĹÓËÉČ ÓÓŮĚĎË"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ČĎÚŃÉÎÁ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÇŇŐĐĐŐ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ×ŇĹÍŃ ÍĎÄÉĆÉËÁĂÉÉ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐŇÁ×Á ÄĎÓÔŐĐÁ ĆÁĘĚĎ× ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 msgid "don't execute verify script(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÓĂĹÎÁŇÉĘ(É) ĐŇĎ×ĹŇËÉ"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐĎÄĐÉÓŘ(É) ÔÉĐÁ GPG V3 DSA"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐĎÄĐÉÓÉ ÔÉĐÁ PGP V3 RSA/MD5"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 msgid "sign package(s) (identical to --resign)"
 msgstr "ĐĎÄĐÉÓÁÔŘ ĐÁËĹÔ(Ů) (ÔĎ ÖĹ ÓÁÍĎĹ ŢÔĎ --resign)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 msgid "verify package signature(s)"
 msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ(É) ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr "ÉÍĐĎŇÔÉŇĎ×ÁÔŘ ĎÔËŇŮÔŮĘ ËĚŔŢ"
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 msgid "sign package(s) (identical to --addsign)"
 msgstr "ĐĎÄĐÉÓÁÔŘ ĐÁËĹÔ (ÔĎ ÖĹ ÓÁÍĎĹ ŢÔĎ --addsign)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "ÇĹÎĹŇÉŇĎ×ÁÔŘ ĐĎÄĐÉÓŘ"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr "ĎÂÎÁŇŐÖĹÎ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ×ÍĹÓÔĎ ĎÖÉÄÁĹÍĎÇĎ ÉÓČĎÄÎĎÇĎ\n"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "ÉÓČĎÄÎŮĘ ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, fuzzy, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rc %d status %x\n"
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
-#, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: %s(%s-%s-%s) %sÚÁĐŐÓË ÓÉÎČŇĎÎÎĎÇĎ ÓĂĹÎÁŇÉŃ\n"
+
+#: lib/psm.c:736
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s) ĐŇĎĐŐÓËÁĹÔÓŃ ĚÉŰÎÉĘ \"%s\".\n"
 
-#: lib/psm.c:639
-#, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+#: lib/psm.c:744
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s) %sÚÁĐŐÓË ÓÉÎČŇĎÎÎĎÇĎ ÓĂĹÎÁŇÉŃ\n"
 
-#: lib/psm.c:818
-#, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+#: lib/psm.c:956
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:851
-#, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+#: lib/psm.c:990
+#, fuzzy, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s) ĎŰÉÂËÁ ÓĂĹÎÁŇÉŃ, waitpid(%d) rc %d: %s\n"
 
-#: lib/psm.c:857
-#, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+#: lib/psm.c:996
+#, fuzzy, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s) ĎŰÉÂËÁ ×ŮĐĎĚÎĹÎÉŃ ÓĂĹÎÁŇÉŃ, ËĎÄ ×ĎÚ×ŇÁÔÁ %d\n"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s ÓĎÄĹŇÖÉÔ %d ĆÁĘĚĎ×, ŇĹÚŐĚŘÔÁÔ ĐŇĎ×ĹŇËÉ: %d\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s ĎŰÉÂËÁ ÓĂĹÎÁŇÉŃ (%d), ĐŇĎĐŐÓËÁĹÔÓŃ %s\n"
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 msgid "Unable to reload signature header\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐĹŇĹÚÁÇŇŐÚÉÔŘ ÚÁÇĎĚĎ×ĎË ĐĎÄĐÉÓÉ\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ŇÁÓĐÁËĎ×ËÁ ÁŇČÉ×Á ÎĹ ŐÄÁĚÁÓŘ%s%s: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " ÎÁ ĆÁĘĚĹ "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ĎŰÉÂËÁ ÎÁ ĆÁĘĚĹ %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ĎŰÉÂËÁ × ĆĎŇÍÁÔĹ: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(ÎĹ ÓĎÄĹŇÖÉÔ ĆÁĘĚĎ×)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "ÎĎŇÍÁĚŘÎŮĘ    "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "ÚÁÍĹÎĹÎÎŮĘ    "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "ÎĹ ŐÓÔÁÎĎ×ĚĹÎ "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "ÓĹÔĹ×ĎĘ       "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(ÓĎÓÔ. ÎĹÔ)   "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ÎĹÉÚ×. %3d)  "
 
-#: lib/query.c:266
+#: lib/query.c:271
 msgid "package has not file owner/group lists\n"
 msgstr "ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ÓĐÉÓËĎ× ×ĚÁÄĹĚŘĂĹ×/ÇŇŐĐĐ-×ĚÁÄĹĚŘĂĹ× ĆÁĘĚĎ×\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "ĐÁËĹÔ ÎĹ ÓĎÄĹŇÖÉÔ ÓĐÉÓËĎ× ÎÉ ČĎÚŃĹ× ĆÁĘĚĎ×, ÎÉ ÉČ ID\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "ĎŰÉÂËÁ ÚÁĐŇĎÓÁ %s\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "ÚÁĐŇĎÓŮ Ë ÉÓČĎÄÎŮÍ ĐÁËĹÔÁÍ × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "%s: ÎĹ ĐÁËĹÔ (ÉĚÉ ÍÁÎÉĆĹÓÔ ĐÁËĹÔÁ) rpm : %s\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "ÎĹÔ ĐÁËĹÔĎ×\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ÇŇŐĐĐÁ %s ÎĹ ÓĎÄĹŇÖÉÔ ÎÉËÁËÉČ ĐÁËĹÔĎ×\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ×Ú×ĎÄÉÔ ÔŇÉÇÇĹŇ %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "ĎŰÉÂËÁ ĆĎŇÍÁÔÁ %s: %s.\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "ÎÉ ĎÄÉÎ ĐÁËĹÔ ÎĹ ĐĎÄČĎÄÉÔ Ë %s: %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ÔŇĹÂŐĹÔ %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ÎÉ ĎÄÉÎ ÉÚ ĐÁËĹÔĎ× ÎĹ ĐŇĹÄĎÓÔÁ×ĚŃĹÔ %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ĆÁĘĚ %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ĆÁĘĚ %s ÎĹ ĐŇÉÎÁÄĚĹÖÉÔ ÎÉ ĎÄÎĎÍŐ ÉÚ ĐÁËĹÔĎ×\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ÎĹ×ĹŇÎŮĘ ÎĎÍĹŇ ĐÁËĹÔÁ: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ÎĎÍĹŇ ÚÁĐÉÓÉ ĐÁËĹÔÁ: %u\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÚÁĐÉÓŘ %u\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr "(ĆÁĘĚŮ ÄĎÂÁ×ĚĹÎŮ)"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr "(added provide)"
 
@@ -2523,15 +2629,15 @@ msgstr ")"
 msgid "OK"
 msgstr "ďë"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr "îĺT"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr "äá"
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2541,13 +2647,13 @@ msgstr ""
 "\"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ĐÁËĹÔ %s ÓĎÄĹŇÖÉÔ ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ %s: %s\n"
@@ -2557,154 +2663,183 @@ msgstr "ĐÁËĹÔ %s ÓĎÄĹŇÖÉÔ ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ %s: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ĐŇĎĐŐÝĹÎ ÉÚ-ÚÁ ĆĚÁÇÁ missingok\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr "========== ĐĹŇĹÍĹÝĹÎÉĘ\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ÉÓËĚŔŢĹÎ %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ĐĹŇĹÍĹÝĹÎÉĹ %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ÉÓËĚŔŢÁĹÔÓŃ %s %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+msgid "Failed dependencies:\n"
+msgstr "îĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr "    đŇĹÄĚÁÇÁĹÍĎĹ ŇÁÚŇĹŰĹÎÉĹ:\n"
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "đĎÄÇĎÔĎ×ËÁ..."
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr "đĎÄÇĎÔĎ×ËÁ ĐÁËĹÔĎ× ÄĚŃ ŐÓÔÁÎĎ×ËÉ..."
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr "đĹŇĹŐĐÁËĎ×ËÁ..."
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr "đĹŇĹŐĐËÁ×ĎËÁ ĆÁĘĚĎ× ĐŇĹÄÎÁÚÎÁŢĹÎÎŮČ ÄĚŃ ŐÄÁĚĹÎÉŃ..."
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr "ďÂÎĎ×ĚĹÎÉĹ..."
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 msgid "Upgrading packages..."
 msgstr "ďÂÎĎ×ĚĹÎÉĹ ĐÁËĹÔĎ×..."
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "äĎÂÁ×ĚŃĹÔÓŃ ĂĹĚŘ: %s\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "úÁÇŇŐÖÁĹÔÓŃ %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... ËÁË %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ĐŇĎĐŐÓËÁĹÔÓŃ - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<ÉÓČĎÄÎŮĘ ĐÁËĹÔ>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "ĐÁËĹÔ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÉÚ ĆÁĘĚÁ %s\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "ÄĚŃ ĆÁĘĚÁ %s ÎĹĎÂČĎÄÉÍÁ ÂĎĚĹĹ ÎĎ×ÁŃ ×ĹŇÓÉŃ RPM\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "%s: ÎĹ ĐÁËĹÔ (ÉĚÉ ÍÁÎÉĆĹÓÔ ĐÁËĹÔÁ) rpm : %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ÎÁĘÄĹÎĎ %d ÉÓČĎÄÎŮČ É %d ÂÉÎÁŇÎŮČ ĐÁËĹÔĎ×\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-msgid "Failed dependencies:\n"
-msgstr "îĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr "    đŇĹÄĚÁÇÁĹÍĎĹ ŇÁÚŇĹŰĹÎÉĹ:\n"
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ %s: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ÚÁÄÁĹÔ ÎĹÓËĎĚŘËĎ ĐÁËĹÔĎ×\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "őÓÔÁÎÁ×ĚÉ×ÁĹÔÓŃ %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "ďÔËÁÔ ĐÁËĹÔĎ× (+%d/-%d) ÎÁ %-24.24s (0x%08x):\n"
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "úÁÇŇŐÖÁĹÔÓŃ %s\n"
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2719,7 +2854,8 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr "ÉÍĹÎÁ ĆÁĘĚÁ(Ď×) ČŇÁÎŃÔÓŃ × ĆĎŇÍÁÔĹ (dirName,baseName,dirIndex)."
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+#, fuzzy
+msgid "package payload can be compressed using bzip2."
 msgstr "ÄĚŃ ŐĐÁËĎ×ËÉ ÓĎÄĹŇÖÉÍĎÇĎ ĐÁËĹÔÁ ÉÓĐĎĚŘÚŐĹÔÓŃ bzip2"
 
 #: lib/rpmlibprov.c:38
@@ -2746,6 +2882,11 @@ msgstr "ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ ŢÁÓÔÉŢÎÁŃ ŐÓÔÁÎĎ×ËÁ ÎÁÂĎŇÁ ÖĹÓÔËÉČ ÓÓŮĚĎË ĐÁËĹÔÁ."
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ ÄĚŃ ÓÔŇĎË\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2821,175 +2962,230 @@ msgstr "%s ËĎÎĆĚÉËÔŐĹÔ Ó%s%s"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ÎĹÉÚ×ĹÓÔÎÁŃ ĎŰÉÂËÁ %d ĐŇÉ ŇÁÂĎÔĹ Ó ĐÁËĹÔĎÍ %s"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ×ÔĎŇĎĹ ':' × %s:%d\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ÎÁÚ×ÁÎÉĹ ÁŇČÉÔĹËÔŐŇŮ × %s:%d\n"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "îĹĐĎĚÎÁŃ ÓÔŇĎËÁ ÄÁÎÎŮČ × %s:%d\n"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "óĚÉŰËĎÍ ÍÎĎÇĎ ÁŇÇŐÍĹÎÔĎ× × ÓÔŇĎËĹ ÄÁÎÎŮČ × %s:%d\n"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "îĹ×ĹŇÎŮĘ ÎĎÍĹŇ arch/os: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "îĹĐĎĚÎÁŃ ÓÔŇĎËÁ ĐĎ ŐÍĎĚŢÁÎÉŔ × %s:%d\n"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "óĚÉŰËĎÍ ÍÎĎÇĎ ÁŇÇŐÍĹÎÔĎ× × ÓÔŇĎËĹ ĐĎ ŐÍĎĚŢÁÎÉŔ × %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ %s: %s.\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ':' (ÎÁĘÄĹÎ 0x%02x) × %s:%d\n"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ÁŇÇŐÍĹÎÔ ÄĚŃ %s × %s:%d\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "ĎŰÉÂËÁ ŇÁÓËŇŮÔÉŃ %s ÎÁ %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s × %s:%d %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ ÁŇČÉÔĹËÔŐŇÁ ÄĚŃ %s × %s:%d\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "ÎĹ×ĹŇÎŮĘ ĐÁŇÁÍĹÔŇ '%s' × %s:%d\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "îĹÉÚ×ĹÓÔÎÁŃ ÓÉÓÔĹÍÁ: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "ó×ŃÖÉÔĹÓŘ Ó rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ŇÁÓËŇŮÔŘ %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ %s, ÚÎÁŢĹÎÉĹ HOME ÓĚÉŰËĎÍ ×ĹĚÉËĎ.\n"
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s ÄĚŃ ŢÔĹÎÉŃ: %s.\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ ÂÁÚŐ ÄÁÎÎŮČ Packages × %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "ÎĹ×ĹŇÎŮĘ ÎĎÍĹŇ ĐÁËĹÔÁ: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "ďÔÓŐÔÓÔ×ŐĹÔ '(' × %s %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "ÎĹ×ĹŇÎŮĘ ÎĎÍĹŇ ĐÁËĹÔÁ: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ÂÁÚŐ ÄÁÎÎŮČ ŇÁÚŇĹŰĹÎÉŃ ÚÁ×ÉÓÉÍĎÓÔĹĘ × %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, c-format
 msgid "Adding: %s\n"
 msgstr "äĎÂÁ×ĚŃĹÔÓŃ: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "đŇĹÄĚÁÇÁĹÔÓŃ: %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "ÓÔŇĎÉÔÓŃ ÓĐÉÓĎË ÓÍĎÎÔÉŇĎ×ÁÎÎŮČ ĆÁĘĚĎ×ŮČ ÓÉÓÔĹÍ\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3006,6 +3202,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3030,6 +3227,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3097,6 +3295,9 @@ msgstr "đĎĚŐŢĹÎĎ %d ÂÁĘÔ ĐĎÄĐÉÓÉ GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3120,41 +3321,164 @@ msgstr "ŇÁÚÍĹŇ úÁÇĎĚĎ×ËÁ É óĎÄĹŇÖÉÍĎÇĎ:"
 msgid "MD5 digest: "
 msgstr "ÄÁĘÄÖĹÓÔ MD5:"
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 msgid "Header SHA1 digest: "
 msgstr "ÄÁĘÄÖĹÓÔ SHA1 ÚÁÇĎĚĎ×ËÁ:"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 msgid "V3 RSA/MD5 signature: "
 msgstr "ĐĎÄĐÉÓŘ RSA/MD5 V3: "
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr "úÁÇĎĚĎ×ĎË "
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr "ĐĎÄĐÉÓŘ DSA V3: "
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "đŇĎ×ĹŇËÁ ĐĎÄĐÉÓÉ: îĺđňá÷éěřîůĺ đáňáíĺôňů\n"
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "ëĎÎÔŇ. ÓŐÍÍÁ MD5 ĐĎ×ŇĹÖÄĹÎÁ: îĺ đďääĺňöé÷áĺôóń\n"
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "đĎÄĐÉÓŘ: îĺéú÷ĺóôîď (%d)\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "ĎÂÎÁŇŐÖĹÎ Ä×ĎÉŢÎŮĘ ĐÁËĹÔ ×ÍĹÓÔĎ ĎÖÉÄÁĹÍĎÇĎ ÉÓČĎÄÎĎÇĎ\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "ÎÉ ĎÄÉÎ ĐÁËĹÔ ÎĹ ĐĎÄČĎÄÉÔ Ë %s: %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<ÉÓČĎÄÎŮĘ ĐÁËĹÔ>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<ÉÓČĎÄÎŮĘ ĐÁËĹÔ>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÚÁÇĎĚĎ×ËÁ ÉÚ ĐÁËĹÔÁ\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3163,11 +3487,15 @@ msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, fuzzy, c-format
 msgid "sanity checking %d elements\n"
 msgstr "ĐŇĎ×eŇŃĹÔÓŃ %d ÜĚĹÍĹÎÔĎ×\n"
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3176,7 +3504,7 @@ msgstr "ĐŇĎ×eŇŃĹÔÓŃ %d ÜĚĹÍĹÎÔĎ×\n"
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "ĐĎÄÓŢÉÔŮ×ÁĹÔÓŃ ĎÔĐĹŢÁÔĎË(ËÉ) %d ĆÁĘĚÁ(Ď×)\n"
@@ -3184,13 +3512,37 @@ msgstr "ĐĎÄÓŢÉÔŮ×ÁĹÔÓŃ ĎÔĐĹŢÁÔĎË(ËÉ) %d ĆÁĘĚÁ(Ď×)\n"
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr "ĐĎÄÓŢÉÔŮ×ÁĹÔÓŃ ÄÉÓĐĎÚÉĂÉŃ ĆÁĘĚĎ×\n"
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
-#, c-format
-msgid "missing  %c %s"
+#, fuzzy, c-format
+msgid "missing   %c %s"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ   %c %s"
 
 #: lib/verify.c:437
@@ -3223,136 +3575,136 @@ msgstr "ŐÄÁĚĹÎĎ ĎËŇŐÖĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ĎËŇŐÖĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "ÚÁËŇŮÔ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "ĐŇĎ×ĹŇĹÎ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĎĚŐŢÉÔŘ ÂĚĎËÉŇĎ×ËŐ %s ÎÁ %s/%s\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "ÉÓËĚŔŢÉÔĹĚŘÎŮĘ"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "ŇÁÚÄĹĚŃĹÍŮĘ"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "ÚÁÂĚĎËÉŇĎ×ÁÎ ÉÎÄĹËÓ ÂÁÚŮ ÄÁÎÎŮČ %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "ÎĹĎĐĎÚÎÁÎÎŮĘ ĐÁŇÁÍĹÔŇ ÂÁÚŮ ÄÁÎÎŮČ: \"%s\" ĐŇĎÉÇÎĎŇÉŇĎ×ÁÎ\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "ÎĹ×ĹŇÎĎĹ ŢÉÓĚĎ×ĎĹ ÚÎÁŢĹÎÉĹ %s, ĐŇĎĐŐÝĹÎĎ\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s ÉÍĹĹÔ ÓĚÉŰËĎÍ ÍÁĚŐŔ ÉĚÉ ÓĚÉŰËĎÍ ÂĎĚŘŰŐŔ ×ĹĚÉŢÉÎŐ long, ĐŇĎĐŐÝĹÎĎ\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 "%s ÉÍĹĹÔ ÓĚÉŰËĎÍ ÍÁĚŐŔ ÉĚÉ ÓĚÉŰËĎÍ ÂĎĚŘŰŐŔ ×ĹĚÉŢÉÎŐ integer, ĐŇĎĐŐÝĹÎĎ\n"
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"{\" ĐĎÓĚĹ \"%\""
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "ĎÔÓŐÔÓÔ×ŐĹÔ \"}\" ĐĎÓĚĹ \"%{\""
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "ĐŐÓÔĎĘ ĆĎŇÍÁÔ ÔÜÇÁ"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "ĐŐÓÔĎĹ ÉÍŃ ÔÜÇÁ"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "ÎĹÉÚ×ĹÓÔÎŮĘ ÔÜÇ"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "× ËĎÎĂĹ ÍÁÓÓÉ×Á ĎÖÉÄÁĚÁÓŘ \"]\""
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"]\""
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "ÎĹĎÖÉÄÁÎÎÁŃ \"}\""
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"?\""
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \"{\""
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĎÖÉÄÁĚĎÓŘ \"}\""
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \"?\" ĎÖÉÄÁĚĎÓŘ \":\""
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \":\" ĎÖÉÄÁĚĎÓŘ \"{\""
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\""
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3379,328 +3731,328 @@ msgstr "ĐŇĎ×ĹŇÉÔŘ ĆÁĘĚŮ ÂÁÚŮ ÄÁÎÎŮČ"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "ÓĎÚÄÁÔŘ ÚÁÇĎĚĎ×ËÉ, ÓĎ×ÍĹÓÔÉÍŮĹ Ó (ŐÓÔÁŇĹ×ŰÉÍÉ) ĐÁËĹÔÁÍÉ rpm[23]"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: ÉÍŃ ËĚŔŢÁ \"%s\" ÎĹ ÉÚ×ĹÓÔÎĎ, ÉÇÎĎŇÉŇŐĹÔÓŃ\n"
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ÉÎÄĹËÓ %s ÉÓĐĎĚŘÚŐŃ db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ÉÎÄĹËÓ %s\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr "ĐÁŇÁÍĹÔĹŇ dbpath ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "ĎŰÉÂËÁ(%d) ĐĎĚŐŢĹÎÉŃ ÚÁĐÉÓĹĘ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s\n"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 #, fuzzy
 msgid "miFreeHeader: skipping"
 msgstr "rpmdb: ĐŇĎĐŐÓËÁĹÔÓŃ"
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "ĎŰÉÂËÁ (%d) ÓĎČŇÁÎĹÎÉŃ ÚÁĐÉÓÉ #%d × %s\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 #, fuzzy
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdb: ĐŇĎĐŐÓËÁĹÔÓŃ"
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: ĐĎĚŐŢĹÎ ĐĎ×ŇĹÖÄĹÎÎŮĘ ÚÁÇĎĚĎ×ĎË #%u -- ĐŇĎĐŐÓËÁĹÔÓŃ.\n"
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ ÚÁÇĎĚĎ×ĎË × 0x%x\n"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "ĎŰÉÂËÁ(%d) ĐĎÄÇĎÔĎ×ËÉ ÚÁĐÉÓÉ ÚÁÇĎĚĎ×ËÁ  #%d ÄĚŃ ŐÄÁĚĹÎÉŃ %s\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ \"%s\" ÉÚ ÉÎÄĹËÓÁ %s.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ ÉÚ ÉÎÄĹËÓÁ %s.\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "ĎŰÉÂËÁ(%d) ĐĎĚŐŢĹÎÉŃ \"%s\" ÚÁĐÉÓĹĘ ÉÚ ÉÎÄĹËÓÁ %s\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "ĎŰÉÂËÁ(%d) ÓĎČŇÁÎĹÎÉŃ ÚÁĐÉÓÉ \"%s\" × %s\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "ĎŰÉÂËÁ(%d) ŐÄÁĚĹÎÉŃ ÚÁĐÉÓÉ %s ÉÚ %s\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "ĎŰÉÂËÁ(%d) ŇĹÚĹŇ×ÉŇĎ×ÁÎÉŃ ĐÁÍŃÔÉ ÄĚŃ ĎÂŇÁÚÁ ÎĎ×ĎÇĎ ĐÁËĹÔÁ\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: ĐŇĎĐŐÓËÁĹÔÓŃ"
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ \"%s\" × ÉÎÄĹËÓ %s.\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "ÄĎÂÁ×ĚŃĹÔÓŃ %d ÚÁĐÉÓĹĘ × ÉÎÄĹËÓ %s\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "ĎŰÉÂËÁ(%d) ÚÁĐÉÓÉ ÚÁĐÉÓÉ %s × %s\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ %s ĐĎÓĚĹ ŐÓĐĹŰÎĎÇĎ ÚÁ×ĹŇŰĹÎÉŃ ĐĹŇĹÉÎÄĹËÁĂÉÉ ÂÁÚŮ × db3.\n"
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "ĐÁŇÁÍĹÔĹŇ dbpath ÎĹ ŐÓÔÁÎĎ×ĚĹÎ"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ĐĹŇĹÓÔŇÁÉ×ÁĹÔÓŃ ÂÁÚÁ ÄÁÎÎŮČ %s × %s\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "×ŇĹÍĹÎÎÁŃ ÂÁÚÁ ÄÁÎÎŮČ %s ŐÖĹ ÓŐÝĹÓÔ×ŐĹÔ\n"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÓÔÁŇÁŃ ÂÁÚÁ ÄÁÎÎŮČ ŢĹŇĹÚ dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ĎÔËŇŮ×ÁĹÔÓŃ ÎĎ×ÁŃ ÂÁÚÁ ÄÁÎÎŮČ ŢĹŇĹÚ dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "ÚÁÇĎĚĎ×ĎË ÎĎÍĹŇ %u × ÂÁÚĹ ÄÁÎÎŮČ ÎĹ×ĹŇÎŮĘ -- ĐŇĎĐŐÓËÁĹÔÓŃ.\n"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÄĎÂÁ×ÉÔŘ ÚÁĐÉÓŘ (ĐĹŇ×ĎÎÁŢÁĚŘÎĎ × %u)\n"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ĐĹŇĹÓÔŇĎĹÎÉĹ ÂÁÚŮ ÄÁÎÎŮČ ÎĹ ŐÄÁĚĎÓŘ, ÓÔÁŇÁŃ ÂÁÚÁ ÄÁÎÎŮČ ĎÓÔÁĹÔÓŃ ÎÁ ÍĹÓÔĹ\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÚÁÍĹÎÉÔŘ ÓÔÁŇŐŔ ÂÁÚŐ ÄÁÎÎŮČ ÎÁ ÎĎ×ŐŔ!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ĆÁĘĚŮ × %s ÚÁÍĹÎŃŔÔÓŃ ĆÁĘĚÁÍÉ ÉÚ %s ÄĚŃ ×ĎÓÓÔÁÎĎ×ĚĹÎÉŃ"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr "ŐÄÁĚŃĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ĎŰÉÂËÁ ŐÄÁĚĹÎÉŃ ËÁÔÁĚĎÇÁ %s: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "====================== ÁËÔÉ×ÎŮČ %d ĐŐÓÔŮČ %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(ĐŐÓÔĎ)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(ĐŐÓÔĎ)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "îĹÚÁËŇŮÔŮĘ ÍÁËŇĎÓ %%%s\n"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "îĹÄĎĐŐÓÔÉÍĎĹ ÉÍŃ (%%define) ÍÁËŇĎÓÁ %%%s\n"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "îĹÚÁËŇŮÔŮĹ ĐÁŇÁÍĹÔŇŮ × ÍÁËŇĎÓĹ %%%s\n"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "íÁËŇĎÓ %%%s ĐŐÓÔ\n"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ŇÁÓËŇŮÔŘ ÍÁËŇĎÓ %%%s\n"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "îĹÄĎĐŐÓÔÉÍĎĹ ÉÍŃ (%%undefine) ÍÁËŇĎÓÁ %%%s\n"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "íÁËŇĎÓ %%%s (%s) ÎĹ ÂŮĚ ÉÓĐĎĚŘÚĎ×ÁÎ ÎÉÖĹ ŐŇĎ×ÎŃ %d\n"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "îĹÉÚ×ĹÓÔÎŮĘ ĐÁŇÁÍĹÔŇ %c × %s(%s)\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "çĚŐÂÉÎÁ ŇĹËŐŇÓÉÉ(%d) ÂĎĚŘŰĹ ÄĎĐŐÓÔÉÍĎĘ(%d)\n"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "îĹÚÁËŇŮÔÁŃ %c: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "ÎĹĐĎÎŃÔÎŮĘ ÍÁËŇĎÓ ĐĎÓĚĹ %%\n"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "íÁËŇĎÓ %%%.*s ÎĹ ÎÁĘÄĹÎ, ĐŇĎĐŐÓËÁŔ\n"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "đĹŇĹĐĎĚÎĹÎÉĹ ĂĹĚĹ×ĎÇĎ ÂŐĆĹŇÁ\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "ćÁĘĚ %s: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "äĚÉÎÁ ĆÁĘĚÁ %s ÍĹÎŘŰĹ ŢĹÍ %u ÂÁĘÔ\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "÷ŮĐĎĚÎĹÎĎ"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "îĹ×ĹŇÎŮĘ ĎÔ×ĹÔ ÓĹŇ×ĹŇÁ"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr "ďŰÉÂËÁ ××ĎÄÁ/×Ů×ĎÄÁ ÓĹŇ×ĹŇÁ"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "ôÁĘÍÁŐÔ ÓĹŇ×ĹŇÁ"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "îĹ ÍĎÇŐ ÎÁĘÔÉ ÁÄŇĹÓ ÓĹŇ×ĹŇÁ"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "îĹ ÍĎÇŐ ÎÁĘÔÉ ÉÍŃ ÓĹŇ×ĹŇÁ"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "îĹ ÍĎÇŐ ÓĎĹÄÉÎÉÔŘÓŃ Ó ÓĹŇ×ĹŇĎÍ"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "îĹ ÍĎÇŐ ŐÓÔÁÎĎ×ÉÔŘ ÓĎĹÄÉÎĹÎÉĹ ÄĚŃ ÄÁÎÎŮČ Ó ÓĹŇ×ĹŇĎÍ"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr "ćÁĘĚĎ×ÁŃ ĎŰÉÂËÁ ××ĎÄÁ/×Ů×ĎÄÁ"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "ďŰÉÂËÁ ĐŇÉ ĐĹŇĹ×ĎÄĹ ŐÄÁĚĹÎÎĎÇĎ ÓĹŇ×ĹŇÁ × ĐÁÓÓÉ×ÎŮĘ ŇĹÖÉÍ"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "ćÁĘĚ ÎĹ ÎÁĘÄĹÎ ÎÁ ÓĹŇ×ĹŇĹ"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "ďÔÍĹÎÁ × ĐŇĎĂĹÓÓĹ"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "îĹÉÚ×ĹÓÔÎÁŃ ÉĚÉ ÎĹĎÖÉÄÁÎÎÁŃ ĎŰÉÂËÁ"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "ŇĹÇÉÓÔŇÉŇŐŔÓŘ × %s ËÁË %s, ĐÁŇĎĚŘ %s\n"
@@ -3710,6 +4062,7 @@ msgid "(no error)"
 msgstr "(ÎĹÔ ĎŰÉÂËÉ)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "ĆÁÔÁĚŘÎÁŃ ĎŰÉÂËÁ: "
@@ -3729,91 +4082,60 @@ msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "memory alloc (%u bytes) returned NULL.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "×ÎÉÍÁÎÉĹ: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "×ÎÉÍÁÎÉĹ: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "ĐŇĹÄŐĐŇĹÖÄĹÎÉĹ: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "đÁŇĎĚŘ ÄĚŃ %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "ĎŰÉÂËÁ: %s ĐĎŇÔ ÄĎĚÖĹÎ ÂŮÔŘ ŢÉÓĚĎÍ\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "url ĐĎŇÔ ÄĎĚÖĹÎ ÂŮÔŘ ŢÉÓĚĎÍ\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 msgid "don't verify header+payload signature"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐĎÄĐÉÓŘ ÚÁÇĎĚĎ×ĎËÁ É ÓĎÄĹŇÖÉÍĎÇĎ"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr "ÎĹ ĎÂÎĎ×ĚŃÔŘ ËÜŰ ÂÁÚŮ ÄÁÎÎŮČ. ÔĎĚŘËĎ ×Ů×ĹÓÔÉ ĐŐÔÉ ĐÁËĹÔÁ."
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-msgid "don't change directories"
-msgstr "ÎĹ ÍĹÎŃÔŘ ËÁÔÁĚĎÇÉ"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr "ÎĹ ÚÁĐŇÁŰÉ×ÁÔŘ ÉÎĆĎŇÍÁĂÉŔ Ď ĆÁĘĚÁČ"
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr "ÎĹ ĐĹŇĹÓĹËÁÔŘ ÇŇÁÎÉĂŮ ĆÁĘĚĎ×ŮČ ÓÉÓÔĹÍ"
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr "ÎĹ ×ĎÚ×ŇÁÝÁÔŘ ÉÎĆĎŇÍÁĂÉŔ"
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr "ďÂÝÉĹ ĐÁŇÁÍĹÔŇŮ ÄĚŃ ×ÓĹČ ŇĹÖÉÍĎ× É ËĎÍĐĎÎĹÎÔĎ× rpm:"
+#: tools/rpmcache.c:519
+#, fuzzy
+msgid "File tree walk options:"
+msgstr "đÁŇÁÍĹÔŇŮ ĐĎÄĐÉÓÉ:"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: ÍÁËŇĎÓ %%{_cache_dbpath} ÎĹĐŇÁ×ÉĚŘÎĎ ĎĐŇĹÄĹĚŁÎ.\n"
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ĎŰÉÂËÁ ŇÁÂĎÔŮ Ó ËÜŰ: ËĎÄ ĎŰÉÂËÉ %d.\n"
@@ -3917,6 +4239,27 @@ msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ ÂÁÚŐ ÄÁÎÎŮČ × ëáôáěďçĺ"
 msgid "DIRECTORY"
 msgstr "ëáôáěďç"
 
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "ďÂÝÉĹ ĐÁŇÁÍĹÔŇŮ ÄĚŃ ×ÓĹČ ŇĹÖÉÍĎ×:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "ÓÔŇĎËÁ %d: éÍĹÎÁ ĆÁĘĚĎ× ÎĹ ŇÁÚŇĹŰÁŔÔÓŃ: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ, ÄÁÖĹ ĹÓĚÉ ĐÁËĹÔ ĐĹŇĹĐÉŰĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎÎŮĹ ĆÁĘĚŮ"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "ĎŰÉÂËÁ ÚÁĐŇĎÓÁ %s\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "ÚÁĐŇĎÓŮ Ë ÉÓČĎÄÎŮÍ ĐÁËĹÔÁÍ × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "ÎĹÔ ĐÁËĹÔĎ×\n"
+
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "ÉÓËĚŔŢÁĹÔÓŃ ÍÎĎÇĎÂÉÂĚÉĎÔĹŢÎŮĘ ĐŐÔŘ %s%s\n"
 
diff --git a/po/sk.po b/po/sk.po
index 8f557a5ec..bee89b5e1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -63,10 +63,12 @@ msgid "Building for target %s\n"
 msgstr "vyhľadáva sa balík %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "argument nie je RPM balík\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "chyba pri čítaní hlavičky balíka\n"
 
@@ -83,171 +85,175 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 #, fuzzy
 msgid "Signature options:"
 msgstr "Veľkosť podpisu:   %d\n"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzia %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Program môže byť voľne redistribuovaný v súlade s podmienkami GNU GPL"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "môže byť použitý iba jeden hlavný režim"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "naraz môže byť vykonaný jeden typ otázky alebo overenia"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "iba inštalácia, aktualizácia a odstránenie zdrojov môžu byť vynútené"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "súbory môžu byť presunuté iba počas inčtalácie balíka"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate a --excludepath môžu byť použité iba počas inštalácie nových "
 "balíkov"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix môže byť použitý iba počas inštalácie nových balíkov"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pre --prefix musia začínať znakom /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) môže byť použitý iba počas inštalácie balíka"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles môže byť použité iba počas inštalácie balíka"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "môže byť použitá iba jedna voľba z --excludedocs a --includedocs"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches môže byť použité iba počas odstránenia balíkov"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb môže byť použité iba počas inštalácie a odstránenia balíka"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb môže byť použité iba počas inštalácie a odstránenia balíka"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb môže byť použité iba počas inštalácie a odstránenia balíka"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -256,7 +262,7 @@ msgstr ""
 "--nodeps môže byť použité iba počas inštalácie, odstránenia alebo overenia "
 "balíka"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -264,7 +270,7 @@ msgstr ""
 "--test môže byť použité iba počas inštalácie, odstránenia alebo zostavenia "
 "balíka"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -272,83 +278,88 @@ msgstr ""
 "--root (-r) môže byť použité iba počas inštalácie a odstránenia balíka, "
 "otázky alebo znovuzostavenia databázy"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pre --root (-r) musia začínať znakom /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "nie je možné pracovať so súborom %s\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp nebolo nájdené: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Kontrola hesla zlyhala\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Heslo je v poriadku.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Chybná špecifikácia %%_signature v makro-súbore.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign môže byť použíté iba počas zostavenia balíka"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "neboli zadané žiadne balíky pre znovuzostavenie"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "neboli zadané žiadne spec-súbory pre zostavenie"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "neboli zadané žiadne tar-súbory pre zostavenie"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "neboli zadané žiadne balíky pre inštaláciu"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "neboli zadané žiadne balíky pre inštaláciu"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "neboli zadané žiadne argumenty pre otázku"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "neboli zadané žiadne argumenty pre overenie"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "neboli zadané žiadne argumenty pre otázku"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie je možné otvoriť dočasný súbor"
@@ -437,176 +448,176 @@ msgstr "&& a || nie sú podporované pre reťazce"
 msgid "syntax error in expression\n"
 msgstr "chyba syntaxe vo výraze"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "chyba PREKROČENIA ČASU: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "chýbajúce    %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "chýbajúca ':' na %s:%d"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Chybný %s prvok: %s"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "chýbajúce    %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:608
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Chybná %s() syntax: %s"
 
-#: build/files.c:609
+#: build/files.c:618
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Chybná špecifikácia práv %s(): %s"
 
-#: build/files.c:621
+#: build/files.c:630
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Chybná špecifikácia práv adresára %s(): %s"
 
-#: build/files.c:779
+#: build/files.c:788
 #, fuzzy, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Iba jeden záznam v %%lang(): %s"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, fuzzy, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Iba jeden záznam v %%lang(): %s"
 
-#: build/files.c:920
+#: build/files.c:929
 #, fuzzy, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Dosiahnutý limit pre %%docdir"
 
-#: build/files.c:928
+#: build/files.c:937
 #, fuzzy, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Iba jeden argument pre %%docdir"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dva súbory na riadku: %s"
 
-#: build/files.c:981
+#: build/files.c:990
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Súbory musia začínať znakom \"/\": %s"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, fuzzy, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie je možné miešať špeciálne %%doc s inými formami: %s"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Súbor zadaný dvakrát: %s."
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Súbor nesúhlasí s prefixom (%s): %s."
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Súbor nebol nájdený: %s"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Súbor potrebuje na začiatku \"/\": %s"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "riadok %d: V %s sú vyžadované verzie: %s"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Súbor nebol nájdený: %s"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "chybe: nie je možné otvoriť %%files súbor: %s"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "riadok: %s"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Chybný vlastník/skupina: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "vyhľadáva sa balík %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Spracovávajú sa súbory: %s\n"
@@ -660,7 +671,7 @@ msgstr "cpio_copy zápis zlyhal: %s"
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy čítanie zlyhalo: %s"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nie je možné otvoriť PreIn súbor: %s"
@@ -670,127 +681,127 @@ msgstr "Nie je možné otvoriť PreIn súbor: %s"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nie je možné otvoriť PreUn súbor: %s"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nie je možné otvoriť PostIn súbor: %s"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nie je možné otvoriť PostUn súbor: %s"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nie je možné otvoriť VerifyScript súbor: %s"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nie je možné otvoriť Trigger skriptový súbor: %s"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otvorenie %s: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: čítanie %s: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie je RPM balík\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: čítanie hlavičky %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie je možné prečítať ikonu: %s"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nie je možné zapísať %s"
 
-#: build/pack.c:514
+#: build/pack.c:528
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Chybné CSA dáta"
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nie je možné zapísať %s"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nie je možné prečítať ikonu: %s"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je možné zapísať balík: %s"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie je prečítať sigtarget: %s"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie je možné prečítať ikonu: %s"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nie je možné zapísať balík: %s"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie je možné prečítať ikonu: %s"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je možné zapísať balík: %s"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie je možné vytvoriť meno výstupného súboru pre balík %s: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie je možné zapísať do %s: "
@@ -835,17 +846,17 @@ msgstr "žiadny popis v %%changelog"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "riadok %d: Chyba pri analýze %%description: %s"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "riadok %d: Chybná voľba %s: %s"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "riadok %d: Priveľa názvov: %s"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "riadok %d: Balík neexistuje: %s"
@@ -865,123 +876,128 @@ msgstr "riadok %d: Chyba pri analýze %%files: %s"
 msgid "line %d: Second %%files list\n"
 msgstr "riadok %d: Druhý %%files zoznam"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, fuzzy, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Architektúra je vynechaná: %s"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, fuzzy, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Architektúra nie je obsiahnutá: %s"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS je vynechaný: %s"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS nie je obsiahnutý: %s"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "V balíku musí existovať pole %s: %s"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Duplicitné záznamy %s v balíku: %s"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Nie je možné prečítať ikonu: %s"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Nie je možné prečítať ikonu: %s"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Neznámy typ ikony: %s"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "riadok %d: Chybná voľba %s: %s"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "riadok %d: Znetvorený popis: %s"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "riadok %d: Prázdny popis: %s"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "riadok %d: Neprípustný znak '-' v %s: %s"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "riadok %d: BuildRoot nemôže byť \"/\": %s"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "riadok %d: Prefixy nesmú končiť \"/\": %s"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "riadok %d: Docdir musí začínať '/': %s"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "riadok %d: Epoch/Serial pole musí byť číslo: %s"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "riadok %d: Chybné %s číslo: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "riadok %d: Chybný formát BuildArchitecture: %s"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Interná chyba: Čudný popis %d "
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Chybná špecifikácia balíka: %s"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "Balík už existuje: %s"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "riadok %d: Neznámy popis: %s"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 #, fuzzy
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec súbor nemôže použiť BuildRoot"
@@ -1062,83 +1078,88 @@ msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
 msgstr "riadok %d: %s: prvky musia začínať alfanumerickým znakom: %s"
 
-#: build/parseReqs.c:113
-#, fuzzy, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "riadok %d: Obsoletes: neobsahuje žiadne názvy súborov: %s"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "riadok %d: Názvy súborov v %s neobsahujú verzie: %s"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, fuzzy, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "riadok %d: V %s sú vyžadované verzie: %s"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, fuzzy, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "riadok %d: triggers musia obsahovať --: %s"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, fuzzy, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "riadok %d: Chyba pri analýze %s: %s"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "riadok %d: program skriptu musí začínať '/': %s"
+
+#: build/parseScript.c:209
 #, fuzzy, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "riadok %d: program skriptu musí začínať '/': %s"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, fuzzy, c-format
 msgid "line %d: Second %s\n"
 msgstr "riadok %d: Druhý %s"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "riadok %d: Chyba pri analýze %%description: %s"
+
+#: build/parseSpec.c:201
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "riadok %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "otvorenie zlyhalo: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, fuzzy, c-format
 msgid "Unclosed %%if\n"
 msgstr "Neuzavretý %%if"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else bez if"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif bez if"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, fuzzy, c-format
 msgid "malformed %%include statement\n"
 msgstr "znetvorený príkaz %%include"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Žiadne zostaviteľné architektúry"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Balík neobsahuje %%description: %s"
@@ -1275,20 +1296,20 @@ msgstr "neoverovať závislosti balíka"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "neoverovať závislosti balíka"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "neoverovať architektúru balíka"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "overiť podpis balíka"
@@ -1392,82 +1413,93 @@ msgstr ""
 msgid " failed - "
 msgstr " zlyhalo - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "balík %s nie je nainštalovaný\n"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "súbor %s nie je vlastnený žiadnym balíkom\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "chybný stav súboru: %s"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 #, fuzzy
 msgid "(db provides)"
 msgstr "Poskytuje:"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "nájdených %d balíkov\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstraňuje sa index skupín\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(nie je číslo)"
 
@@ -1480,7 +1512,7 @@ msgstr "(nie je číslo)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(nie je číslo)"
@@ -1489,7 +1521,7 @@ msgstr "(nie je číslo)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "vynechať akékoľvek PGP podpisy"
@@ -1509,7 +1541,7 @@ msgstr "mntctl() nevrátil veľkosť fuggeru: %s"
 msgid "failed to stat %s: %s\n"
 msgstr "nepodarilo sa zistiť stav %s: %s"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nepodarilo sa otvoriť %s: %s"
@@ -1583,269 +1615,311 @@ msgstr "otvorenie %s zlyhalo\n"
 msgid "%s created as %s\n"
 msgstr "varovanie: %s vytvorené ako %s"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "premenováva sa %s na %s\n"
+
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie je možné zapísať do %s: "
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je možné zapísať do %s: "
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, fuzzy, c-format
 msgid "error creating temporary file %s\n"
 msgstr "chyba pri vytváraní dočasného súboru %s"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "táto verzia RPM podporuje iba balíky s hlavným číslom <= 3"
 
-#: lib/package.c:786
+#: lib/package.c:794
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "táto verzia RPM podporuje iba balíky s hlavným číslom <= 3"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis nie je k dispozícii\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "vytvára sa adresár %s\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "vypísať verziu používaného rpm"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "poslať štandardný výstup do <príkazu>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "použiť <adresár> ako adresár najvyššej úrovne"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "vypísať verziu používaného rpm"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "chybný stav súboru: %s"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "chybný stav súboru: %s"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "chybný stav súboru: %s"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "chybný stav súboru: %s"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musia začínať znakom /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "presunutia musia začínať znakom /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "presunutia musia obsahovať znak ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "presunutia musia mať za znakom = znak /"
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "opýtať sa všetkých balíkov v skupine"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "inštalovať všetky súbory vrátane konfiguračných súborov, ktoré by inak mohli "
 "byť vynechané"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1853,162 +1927,171 @@ msgstr ""
 "odinštalovať všetky balíky určené <balíkom> (inak je chybou, pokiaľ <balík> "
 "špecifikuje viac ako jeden balík)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "nevykonať žiadne skripty špecifikované balíkom"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "odinštalovať balík"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 #, fuzzy
 msgid "<package>+"
 msgstr "nájdených %d balíkov\n"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "zobraziť všetky konfiguračné súbory"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "neinštalovať dokumentáciu"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "vynechať súbory v ceste <cesta>"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "balík %s nie je nainštalovaný\n"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skratka pre --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "        -p <súbor_balíku>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "vypisovať značky počas inštalácie balíka (vhodné s -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "neoverovať architektúru balíka"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "neoverovať operačný systém balíka"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "pred inštaláciou nekontrolovať dostupné miesto na disku"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "inštalovať dokumentáciu"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "inštalovať balík"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "aktualizovať databázu bez zmeny súborového systému"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "neoverovať závislosti balíka"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "zobraziť všetky konfiguračné súbory"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nemeniť poradie balíkov kvôli vyriešeniu závislostí"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "nevykonať žiadne skripty spúšťané týmto balíkom"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nevykonať žiadne skripty špecifikované balíkom"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nevykonať žiadne inštalačné skripty"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nevykonať žiadne inštalačné skripty"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nevykonať žiadne inštalačné skripty"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2016,500 +2099,516 @@ msgstr ""
 "aktualizovať na staršiu verziu balíka (--force to pri aktualizácii urobí "
 "automaticky)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "vypisovať percentá počas inštalácie balíka"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "presunúť balík do <adresára>, pokiaľ to balík povoľuje"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "presunúť súbory zo <starej_cesty> do <novej_cesty>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "inštalovať aj pokiaľ balík prepíše inštalované súbory"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "preinštalovať, pokiaľ už balík existuje"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "neinštalovať, ale oznámiť, či by to bolo možné"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "    --upgrade <súbor_balíka>"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "opýtať sa na všetky balíky"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "režim otázok"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 #, fuzzy
 msgid "query/verify package(s) owning file"
 msgstr "opýtať sa na balík vlastniaci <súbor>"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "opýtať sa balíku vlastniaceho súbor"
+msgid "query/verify package(s) in group"
+msgstr "opýtať sa všetkých balíkov v skupine"
 
-#: lib/poptQV.c:103
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) in group"
+msgid "query/verify a package file"
+msgstr "opýtať sa na všetky balíky"
+
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "opýtať sa všetkých balíkov v skupine"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "opýtať sa všetkých balíkov v skupine"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "opýtať sa balíku vlastniaceho súbor"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "opýtať sa na všetky balíky"
+msgid "query/verify package(s) with header identifier"
+msgstr "opýtať sa balíku vlastniaceho súbor"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "opýtať sa balíku vlastniaceho súbor"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 #, fuzzy
 msgid "rpm query mode"
 msgstr "režim otázok"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "opýtať sa balíku vlastniaceho súbor"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "opýtať sa spec súboru"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "opýtať sa všetkých balíkov v skupine"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 #, fuzzy
 msgid "query the package(s) triggered by the package"
 msgstr "opýtať sa balíkov spustených balíkom"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "režim otázok"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 #, fuzzy
 msgid "query/verify the package(s) which require a dependency"
 msgstr "opýtať sa na balíky vyžadujúce schopnosť <schopnosť>"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 #, fuzzy
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "opýtať sa na balíky poskytujúce schopnosť <schopnosť>"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "neboli zadané žiadne argumenty pre otázku"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "nie je možné prečítať hlavičku na %d pre vyhľadanie"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "zobraziť všetky konfiguračné súbory"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 #, fuzzy
 msgid "list all documentation files"
 msgstr "zobraziť všetky dokumentačné súbory"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "zobraziť základné informácie o balíku"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "použiť nasledovný formát otázky"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "zobraziiť stav daných súborov"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "neoverovať závislosti balíka"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "podpísať balík (zničiť aktuálny podpis)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "overiť podpis balíka"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podpísať balík (zničiť aktuálny podpis)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 #, fuzzy
 msgid "generate signature"
 msgstr "vytvoriť PGP/GPG podpis"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "očakávaný zdrojový balík, nájdený binárny"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, 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:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nie je možné prečítať ikonu: %s"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvoriť %s: %s"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "chyba formátu: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(neobsahuje žiadne súbory)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normálny      "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "nahradený     "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "neinštalovaný "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "zdieľaný      "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(žiadny stav) "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznámy %d)  "
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
 
-#: lib/query.c:299
+#: lib/query.c:304
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, fuzzy, c-format
-msgid "open of %s failed: %s\n"
-msgstr "otvorenie %s zlyhalo\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "otázka na %s zlyhala\n"
-
-#: lib/query.c:453
-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:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "žiadny z balíkov nespúšťa %s\n"
-
-#: lib/query.c:517
-#, fuzzy
-msgid "no packages\n"
-msgstr "nájdených %d balíkov\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "neznámy tag"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje žiadne balíky\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "žiadny z balíkov nespúšťa %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Nie je možné prečítať %s: %s."
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "žiadny z balíkov nespúšťa %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "žiadny z balíkov nevyžaduje %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "žiadny z balíkov neposkytuje %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, 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:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "chybné číslo balíku: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "požaduje sa záznam číslo %d\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, 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:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "chybný stav súboru: %s"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2607,29 +2706,29 @@ msgstr ")"
 msgid "OK"
 msgstr "V PORIADKU"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "požiadavka balíka %s nie je uspokojená: %s\n"
@@ -2639,158 +2738,187 @@ msgstr "požiadavka balíka %s nie je uspokojená: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vynechaný: %s"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, fuzzy, c-format
+msgid "open of %s failed: %s\n"
+msgstr "otvorenie %s zlyhalo\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "neznámy tag"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "nevyriešené závislosti:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "neboli zadané žiadne balíky pre inštaláciu"
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 #, fuzzy
 msgid "Repackaging erased files..."
 msgstr "balík neobsahuje žiadne súbory\n"
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "    --upgrade <súbor_balíka>"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Zisťujú sa požadované vlastnosti...\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Prenáša sa %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr "... ako %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie je možné nainštalovať\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "nájdených %d balíkov\n"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "binárny balík v starom štýle\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pri vytváraní dočasného súboru %s"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "žiadny z balíkov nespúšťa %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "nevyriešené závislosti:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "inštalujú sa binárne balíky\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie je možné otvoriť súbor %s: %s"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" špecifikuje viac balíkov\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie je možné otvoriť %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Inštaluje sa %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "Prenáša sa %s\n"
+
 #: lib/rpmlead.c:56
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
@@ -2805,7 +2933,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2832,6 +2960,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- nie je podporované pre reťazce"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2907,174 +3040,229 @@ msgstr " koliduje s %s-%s-%s\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "chýbajúce druhé ':' na %s:%d"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "chýba názov architektúry na %s:%d"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Neúplný riadok údajov na %s:%d"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Priveľa argumentov v riadku údajov na %s:%d"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Chybné číslo arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Neúplný implicitný riadok na %s:%d"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Priveľa argumentov v implicitnom riadku na %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Nie je možné prečítať %s: %s."
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "chýbajúca ':' na %s:%d"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "chýbajúci argument pre %s na %s:%d"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "expanzia %s zlyhala na %s:%d \"%s\""
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "nie je možné otvoriť %s na %s:%d"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "chýbajúca architektúra pre %s na %s:%d"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "chybná voľba '%s' na %s:%d"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznámy systém: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Nie je možné expandovať %s"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie je možné otvoriť %s pre čítanie: %s."
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie je možné otvoriť %s/packages.rpm\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "chybné číslo balíku: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "chýbajúce    %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "chybné číslo balíku: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "nie je možné otvoriť %s/packages.rpm\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "riadok: %s"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "zdroje v: %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "presúva sa %s do %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3091,6 +3279,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3115,6 +3304,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3187,6 +3377,9 @@ msgstr "Prečítaný GPG podpis obsahuje %d bajtov\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3211,44 +3404,167 @@ msgstr "Priveľká hlavička"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "zobraziť súbory v balíku"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynechať akékoľvek MD5 podpisy"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "balík nemá skupinu\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "žiadny z balíkov nespúšťa %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "nájdených %d balíkov\n"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "nájdených %d balíkov\n"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "chyba pri čítaní hlavičky balíka\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3257,11 +3573,16 @@ msgstr "vytvára sa adresár %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+#, fuzzy
+msgid "running pre-transaction scripts\n"
+msgstr "vykonávajú sa predinštalačné skripty (ak existujú)\n"
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3270,7 +3591,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3278,13 +3599,38 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+#, fuzzy
+msgid "running post-transaction scripts\n"
+msgstr "vykonávajú sa postdeinštalačné skripty (ak existujú)\n"
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "chýbajúce    %s\n"
 
 #: lib/verify.c:437
@@ -3317,135 +3663,135 @@ msgstr "odstraňuje sa index súborov pre %s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "odstraňuje sa index súborov pre %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "odstraňuje sa index súborov pre %s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "odstraňuje sa index súborov pre %s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nie je možné získať %s zámok pre databázu"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "výhradný"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "zdieľaný"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "odstraňuje sa index súborov pre %s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "chýbajúce { po %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "chýbajúce } po %{"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "prázdny tag formát"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "prázdne meno tagu"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "neznámy tag"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "] očakávané na konci poľa"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "neočakávané ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "neočakávané }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "? očakávané vo výraze"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "{ očakávané po ? vo výraze"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "} očakávané vo výraze"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ": očakávané po ? podvýraze"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "{ očakávané po : vo výraze"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "| očakávené na konci výrazu"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3472,329 +3818,329 @@ msgstr "opýtať sa spec súboru"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nie je možné otvoriť %s na %s:%d"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "nie je možné otvoriť %s\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "nebola nastavená žiadna dbpath"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "chyba pri načítaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie je možné prečítať hlavičku na %d pre vyhľadanie"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "chyba pri načítaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraňuje sa index skupín\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraňuje sa index názvov\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "chyba pri načítaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "chyba pri odstraňovaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba pri hľadaní balíka %s\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "nebola nastavená žiadna dbpath"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "dočasná databáza %s už existuje"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "záznam číslo %d v databáze je chybný -- bol vynechaný"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie je možné pridať záznam pôvodne na %d"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvoriť databázu; zostáva pôvodná\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradiť starú databázu novou!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstrániť adresár %s: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktívnych %d prázdnych %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(prázdne)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prázdne)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s obsahuje neukončené telo"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s obsahuje chybný názov (%%define)"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s obsahuje neukončené voľby"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s obsahuje prázdne telo"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s sa nepodarilo expandovať"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s obsahuje chybný názov (%%undefine)"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) nebolo použité pod úrovňou %d "
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznáma voľba %c v %s(%s)"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Hĺbka rekurzie (%d) väčšia ako maximálna (%d)"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Neukončené %c: %s"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "balík %%%.*s nebol nájdený, vynecháva sa"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "Preplnenie cieľovej vyrovnávacej pamäti"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "Súbor %s: %s"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, fuzzy, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Súbor %s je menší ako %d bajtov"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "Úspech"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Chybná odpoveď servera"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 #, fuzzy
 msgid "Server I/O error"
 msgstr "Chyba vstupu/výstupu servera"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "Prekročenie časového limitu servera"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "Nie je možné vyhľadať adresu servera"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "Nie je možné vyhľadať názov servera"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "Pripojenie k serveru zlyhalo"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "Vytvorenie dátového spojenia k serveru zlyhalo"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "Chyba vstupu/výstupu lokálneho súboru"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pri nastavení vzdialeného servera do pasívneho režimu"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Súbor sa na serveri nenachádza"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "Zrušenie prebieha"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "Neznáma alebo neočakávaná chyba"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prihlasuje sa na %s ako %s, heslo %s\n"
@@ -3805,6 +4151,7 @@ msgid "(no error)"
 msgstr "(chyba 0x%x)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "fatálna chyba: "
@@ -3824,93 +4171,61 @@ msgstr "varovanie: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Heslo pre %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "chyba: %sport musí byť číslo\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "url port musí byť číslo\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvoriť %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "overiť podpis balíka"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
+#: tools/rpmcache.c:519
 #, fuzzy
-msgid "don't change directories"
-msgstr "vytvára sa adresár %s\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr ""
+msgid "File tree walk options:"
+msgstr "Veľkosť podpisu:   %d\n"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: otvorenie zlyhalo\n"
@@ -4007,6 +4322,26 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles môže byť použité iba počas inštalácie balíka"
+
+#, fuzzy
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "riadok %d: Obsoletes: neobsahuje žiadne názvy súborov: %s"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "inštalovať aj pokiaľ balík prepíše inštalované súbory"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "otázka na %s zlyhala\n"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "no packages\n"
+#~ msgstr "nájdených %d balíkov\n"
+
 #, fuzzy
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "vynecháva sa %s\n"
@@ -4056,10 +4391,6 @@ msgstr ""
 #~ msgstr "Starý (iba interný) podpis! Ako ste sa k tomu dostali?!"
 
 #, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "vykonávajú sa poinštalačné skripty (ak existujú)\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr "vykonanie skriptu zlyhalo"
@@ -5148,9 +5479,6 @@ msgstr ""
 #~ msgid "stopping install as we're running --test\n"
 #~ msgstr "inštalácia zastavená kvôli režimu --test\n"
 
-#~ msgid "running preinstall script (if any)\n"
-#~ msgstr "vykonávajú sa predinštalačné skripty (ak existujú)\n"
-
 #, fuzzy
 #~ msgid "removal of %s failed: %s\n"
 #~ msgstr "odstránenie %s zlyhalo: %s"
@@ -5158,9 +5486,6 @@ msgstr ""
 #~ msgid "will remove files test = %d\n"
 #~ msgstr "budú sa odstraňovať súbory test = %d\n"
 
-#~ msgid "running postuninstall script (if any)\n"
-#~ msgstr "vykonávajú sa postdeinštalačné skripty (ak existujú)\n"
-
 #, fuzzy
 #~ msgid ""
 #~ "retrieval of return code of %s scriptlet from %s-%s-%s failed, waitpid "
@@ -5564,9 +5889,6 @@ msgstr ""
 #~ msgid "package %s not listed in %s"
 #~ msgstr "balík %s nie je uvedený v %s"
 
-#~ msgid "package has no group\n"
-#~ msgstr "balík nemá skupinu\n"
-
 #~ msgid "removing provides index for %s\n"
 #~ msgstr "odstraňuje sa index poskytovaných vlastností pre %s\n"
 
diff --git a/po/sl.po b/po/sl.po
index d2c595660..eb6c71233 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,19 +1,19 @@
 # -*- 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.386 2004/03/02 01:32:09 jbj Exp $
+# $Id: sl.po,v 1.387 2004/10/27 22:57:16 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 #, fuzzy
@@ -68,10 +68,12 @@ msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "navedeni argument ni paket RPM\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "napaka pri branju glave paketa\n"
 
@@ -88,167 +90,171 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 #, fuzzy
 msgid "Signature options:"
 msgstr "Dolž. podpisa : %d\n"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM različica %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Ta program je dovoljeno razpečevati pod pogoji navedenimi v GNU GPL."
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "izbran sme biti le en glavni način"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo en tip poizvedbe/preverjanja je možen naenkrat"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "nepričakovane zastavice pri poizvedbi"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "nepričakovana oblika poizvedbe"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "nepričakovan izvor poizvedbe"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix se sme uporabiti le pri namestitvi"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti izbire --prefix se morajo začeti z /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "izbiri --excludedocs in --includedocs se medsebojno izključujeta"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sme podan le ob namestitvi paketa"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sme biti podati le ob namestitvi paketa"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -256,14 +262,14 @@ msgstr ""
 "--nodeps sme biti podan le ob izgradnji, vnovični izgradnji, prevajanju, "
 "namestitvi, odstranitvi ali preverjanju paketa"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -271,83 +277,88 @@ msgstr ""
 "--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
 "vnovični izgradnji paketa"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti izbire --root (-r) se morajo začeti z /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "ni datotek, ki bi jih lahko podpisal\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "dostop do datoteke %s ni možen\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp manjka: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Vnesite pristopno geslo: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Preverjanje pristopnega gesla neuspešno\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Pristopno geslo je pravo.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign sme biti podan le ob izgradnji paketa"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "izvajanje je bilo neuspešno\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovično izgradnjo niso navedeni"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Začasne datoteke ni možno odpreti"
@@ -436,176 +447,176 @@ msgstr "&& in || nista podprta za nize"
 msgid "syntax error in expression\n"
 msgstr "napaka v sklanji izraza"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK neuspešen: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "Manjkajoči ,(` v %s %s"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "Manjkajoči ,)` v %s(%s"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Neveljaven žeton %s: %s"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "Manjkajoči ,(` v %s %s"
 
-#: build/files.c:561
+#: build/files.c:570
 #, fuzzy, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Neprazen znak sledi %s(): %s"
 
-#: build/files.c:599
+#: build/files.c:608
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Nepravilna skladnja: %s(%s)"
 
-#: build/files.c:609
+#: build/files.c:618
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Nepravilno določilo načina: %s(%s)"
 
-#: build/files.c:621
+#: build/files.c:630
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Nepravilno določilo načina imenika: %s(%s)"
 
-#: build/files.c:779
+#: build/files.c:788
 #, fuzzy, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Nenavadna dolžina za locale: \"%.s\" pri %%lang(%s)"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, fuzzy, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Podvojeni locale %.*s za %%lang(%s)"
 
-#: build/files.c:920
+#: build/files.c:929
 #, fuzzy, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Dosegli smo omejitev za %%docdir"
 
-#: build/files.c:928
+#: build/files.c:937
 #, fuzzy, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Za %%docdir je podan samo en argument"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Dve datoteki v eni vrstici: %s"
 
-#: build/files.c:981
+#: build/files.c:990
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Ime datoteke se mora začeti z \"/\": %s"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, fuzzy, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Posebnih %%doc ni možno mešati z ostalimi oblikami: %s"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Datoteka je navedena dvakrat: %s"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, fuzzy, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Simbolna povezava kaže na BuildRoot: %s -> %s"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Datoteka se ne ujema s predpono (%s): %s"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datoteke ni mogoče najti: %s"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead je bil neuspešen\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLead je bil neuspešen\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Datoteki manjka uvodni \"/\": %s"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "vrstica %d: Različica ni dovoljena: %s"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteke ni možno najti z razširitvijo metaznakov v imenu: %s"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Datoteke %s iz %%files ni možno odpreti: %s"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "vrstica: %s"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Poškodovana datoteka: %s: %s"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Neobstoječ lastnik/skupina: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "iščemo paket %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Obdeloavnje datotek: %s-%s-%s\n"
@@ -659,7 +670,7 @@ msgstr "pisanje cpio_copy neuspešno: %s"
 msgid "cpio_copy read failed: %s\n"
 msgstr "branje cpio_copy neuspešno: %s"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Datoteke PreIn ni možno odpreti: %s"
@@ -669,127 +680,127 @@ msgstr "Datoteke PreIn ni možno odpreti: %s"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Datoteke PreUn ni možno odpreti: %s"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Datoteke PostIn ni možno odpreti: %s"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Datoteke PostUn ni možno odpreti: %s"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Datoteke VerifyScript ni možno odpreti: %s"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Skriptne datoteke Trigger ni možno odpreti: %s"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: odpiranje %s: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: branje %s: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspešno: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ni paket tipa RPM\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: branje glave %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ikone %s ni možno prebrati: %s"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ni možno zapisati paketa %s: %s"
 
-#: build/pack.c:514
+#: build/pack.c:528
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Poškodovani podatki CSA"
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Ni možno zapisati paketa %s: %s"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Izdelujemo podpis: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ikone %s ni možno prebrati: %s"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Ni možno odpreti %s: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni možno zapisati paketa: %s"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ciljnega podpisa %s ni možno odpreti: %s"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ikone %s ni možno prebrati: %s"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ni možno zapisati paketa %s: %s"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ikone %s ni možno prebrati: %s"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni možno zapisati paketa %s: %s"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Neuspešno ustvarjanje izhodne datoteke za paket %s: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ni možno ustvariti %s: %s\n"
@@ -834,17 +845,17 @@ msgstr "opis v %%changelog manjka"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "vrstica %d: Napaka pri razčlembi v razdelku %%description: %s"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "vrstica %d: Napačna izbira %s: %s"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "vrstica %d: Preveč imen: %s"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "vrstica %d: Paket ne obstaja: %s"
@@ -864,123 +875,128 @@ msgstr "vrstica %d: Napaka pri razčlembi v razdelku %%Files: %s"
 msgid "line %d: Second %%files list\n"
 msgstr "vrstica %d: Drugi seznam %%Files"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, fuzzy, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Arhitektura je izključena: %s"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, fuzzy, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Arhitektura ni vključena: %s"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS je izključen: %s"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS ni vključen: %s"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "polje %s mora v paketu obstajati: %s"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Podvojeni vnosi %s v paketu: %s"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Ikone %s ni možno odpreti: %s"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Ikone %s ni možno prebrati: %s"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Neznan tip ikone: %s"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "vrstica %d: Napačna izbira %s: %s"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "vrstica %d: Deformirana značka: %s"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "vrstica %d: Prazna značka: %s"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot ne more biti \"/\": %s"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "vrstica %d: Predpone se ne smejo končati z /: %s"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "vrstica %d: Docdir se mora začeti z \"/\": %s"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "vrstica %d: polje Epoch/Serial mora biti število: %s"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "vrstica %d: Okvarjeno število %s: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "vrstica %d: Napačna oblika BuildArchitecture: %s"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Notranja napaka: Neprava značka %d"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Nepravilno določilo paketa: %s"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket že obstaja: %s"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "vrstica %d: Neznana značka: %s"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 #, fuzzy
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Datoteka spec ne more uporabiti BuildRoot"
@@ -1063,83 +1079,88 @@ msgstr ""
 "vrstica %d: Oznake odvisnosti se morajo začeti z alfanum. znakom, ,_` ali\n"
 "'/`: %s"
 
-#: build/parseReqs.c:113
-#, fuzzy, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "vrstica %d: Ime datoteke ni dovoljeno: %s"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "vrstica %d: Ime datoteke z različico ni dovoljeno: %s"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, fuzzy, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "vrstica %d: Zahtevana različica: %s"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, fuzzy, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "vrstica %d: prožila morajo vsebovati --: %s"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, fuzzy, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "vrstica %d: Napaka pri razčlembi %s: %s"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "vrstica %d: skriptni program se mora začeti z ,/`: %s"
+
+#: build/parseScript.c:209
 #, fuzzy, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "vrstica %d: skriptni program se mora začeti z ,/`: %s"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, fuzzy, c-format
 msgid "line %d: Second %s\n"
 msgstr "vrstica %d: Drugi %s"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "vrstica %d: Napaka pri razčlembi v razdelku %%description: %s"
+
+#: build/parseSpec.c:201
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "vrstica %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ni možno odpreti %s: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, fuzzy, c-format
 msgid "Unclosed %%if\n"
 msgstr "Nezaključeni %%if"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, fuzzy, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean vrne %d"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Najden je bil %%else brez pripadajočega if"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Najden je bil %%endif brez pripadajočega if"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, fuzzy, c-format
 msgid "malformed %%include statement\n"
 msgstr "Deformiran stavek %%include"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Arhitektura za izgradnjo ni prisotna"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "V paketu manjka %%description: %s"
@@ -1279,20 +1300,20 @@ msgstr "brez preverjanja soodvisnosti paketa"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "preveri podpis paketa(-ov)"
@@ -1394,83 +1415,94 @@ msgstr ""
 msgid " failed - "
 msgstr " neuspešno - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "paket %s-%s-%s je že nameščen"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s-%s-%s je že nameščen"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "poškodovana zbirka podatkov %s"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "ni paketov\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(ni število)"
 
@@ -1483,7 +1515,7 @@ msgstr "(ni število)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(ni število)"
@@ -1492,7 +1524,7 @@ msgstr "(ni število)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "preskoči vse podpise PGP"
@@ -1512,7 +1544,7 @@ msgstr "mntctl() ni uspešno vrnila velikosti fugger: %s"
 msgid "failed to stat %s: %s\n"
 msgstr "status %s ni na voljo: %s"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspešno odpiranje %s: %s\n"
@@ -1586,268 +1618,310 @@ msgstr "odpiranje %s je bilo neuspešno: %s\n"
 msgid "%s created as %s\n"
 msgstr "opozorilo: %s ustvarjen kot %s"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "dodajanje vnosov 0 %s.\n"
+
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ni možno ustvariti %s: %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni možno"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, fuzzy, c-format
 msgid "error creating temporary file %s\n"
 msgstr "napaka pri ustvarjanju začasne datoteke %s"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ta različica RPM podpira samo pakete z glavnim številom različice <= 3"
 
-#: lib/package.c:786
+#: lib/package.c:794
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ta različica RPM podpira samo pakete z glavnim številom različice <=4"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature je bil neuspešen\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis ni na voljo\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead je bil neuspešen\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspešno: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "ustvarjanje imenika: %s\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "uporabljana različica rpm"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "standardni izhod preusmerjen na <ukaz>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "uporabi <imenik> za korenski imenik"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "prikaži znane značke za poizvedovanje"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "prikaži končni rpmrc in nastavitev makra"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "različica rpm, ki jo uporabljate"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "poti, ki niso obdelane, se morajo začeti z /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "premikanja se morajo začeti z /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "premikanja morajo vsebovati ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "premikanja morajo imeti /, ki mu sledi ="
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "poizvedba po paketu v skupini"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "namestitev vseh datotek, vključno z nastavitvenimi, ki so sicer izpuščene"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1855,163 +1929,172 @@ msgstr ""
 "odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer program izide z "
 "napako, če paket <paket> določa več paketov)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "brez izvajanja skriptov paketa"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "poti %s ni možno premakniti za paket %s-%s-%s"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "izbriši (odstrani) paket"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 #, fuzzy
 msgid "<package>+"
 msgstr "ni paketov\n"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "izpis vseh nastavitvene datoteke"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "brez namestitve dokumentacije"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "preskok datotek v navedeni poti"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "poti %s ni možno premakniti za paket %s-%s-%s"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "okrajšava za --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "paket %s-%s-%s je že nameščen"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "        -p <paket>+       "
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "brez preverjanja operacijskega sistema paketa"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "brez preverjanja prostora na disku pred nameščanjem"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "namesti dokumentacijo"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "nameščanje paketa"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "obnovi podatkovno zbirko, a ne spreminjaj datotečnega sistema"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "izpis vseh nastavitvene datoteke"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "brez izvajanja katerihkoli skriptov, ki jih požene ta paket"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "brez izvajanja skriptov paketa"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2019,498 +2102,514 @@ msgstr ""
 "nadgraditev na starejšo različico paketa (--force pri nadgradnjah "
 "avtomatično vključi to izbiro)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "izpis odstotkov med namestitvijo"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "če je mogoče, bo paket prestavljen v imenik <imenik>"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "prestavljanje datoteke iz stare poti v novo"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "      --relocate <starapot>=<novapot>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "namesti, četudi paket piše prek že nameščene datoteke"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "ponovno namesti, če paket že obstaja"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "ne namesti, a ugotovi, če bi delovalo"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "    --upgrade <paket>      "
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "poizvedba/preverba po vseh paketih"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "poizvedbeni način"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 #, fuzzy
 msgid "query/verify package(s) owning file"
 msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "poizvedba po paketu, ki vsebuje datoteko"
+msgid "query/verify package(s) in group"
+msgstr "poizvedba po paketu v skupini"
 
-#: lib/poptQV.c:103
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) in group"
+msgid "query/verify a package file"
+msgstr "poizvedba/preverba po vseh paketih"
+
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "poizvedba po paketu v skupini"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "poizvedba po paketu v skupini"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "poizvedba po paketu, ki vsebuje datoteko"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "poizvedba/preverba po vseh paketih"
+msgid "query/verify package(s) with header identifier"
+msgstr "poizvedba po paketu, ki vsebuje datoteko"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "poizvedba po paketu, ki vsebuje datoteko"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 #, fuzzy
 msgid "rpm query mode"
 msgstr "poizvedbeni način"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "poizvedba po paketu, ki vsebuje datoteko"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "poizvedba po datoteki spec"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "poizvedba po paketu v skupini"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 #, fuzzy
 msgid "query the package(s) triggered by the package"
 msgstr "poizvedba po paketih, ki jih sproži paket"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "poizvedbeni način"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 #, fuzzy
 msgid "query/verify the package(s) which require a dependency"
 msgstr "poizvedba po paketih, ki potrebujejo dano zmožnost <mož>"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 #, fuzzy
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "poizvedba po paketih, ki ponujajo dano zmožnost <mož>"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "argumenti za poizvedbo niso podani"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: ni možno prebrati glave pri 0x%x"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "izpis vseh nastavitvene datoteke"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "izpis vseh dokumentacijske datoteke"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "iznos osnovnih podatkov o datoteki"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "izpis seznama datotek v paketu"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead je bil neuspešen\n"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "uporabi naslednjo obliko poizvedbe"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "zamenjava razdeljkov I18N z naslednjim katalogom"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "izpis stanja seznama datotek"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "podpiši paket(e) (trenutni podpis zavrzi)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "preveri podpis paketa(-ov)"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podpiši paket(e) (trenutni podpis zavrzi)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 #, fuzzy
 msgid "generate signature"
 msgstr "izdelava podpisa PGP/GPG"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "pričakovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "poganjanje ponamestitvenih skript (če obstajajo)\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "preskočeno - %s - prenos neuspešen - %s\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "skript se ni uspešno izvedel"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Ikone %s ni možno prebrati: %s"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, 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:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspešno odpiranje %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspešen"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "napaka v obliki: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(ne vsebuje datotek)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normalno      "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "nadomeščeno   "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "ni nameščeno  "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "omrežni       "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(brez stanja) "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznano %3d) "
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 
-#: lib/query.c:299
+#: lib/query.c:304
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "odpiranje %s je bilo neuspešno: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "poizvedba po %s je bila neuspešna\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "poizvedba po izvornih paketih v stari obliki ni možna\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "noben paket ne proži %s\n"
-
-#: lib/query.c:517
-#, fuzzy
-msgid "no packages\n"
-msgstr "ni paketov\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "neznana značka"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s ne vsebuje nobenega paketa\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "noben paket ne proži %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Neuspešno branje %s: %s."
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "noben paket ne proži %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "noben paket ne potrebuje %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "noben paket ne nudi %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ni del nobenega paketa\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neveljavna številka paketa: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "številka zapisa paketa: %d\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni možno prebrati\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni nameščen\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "poškodovana zbirka podatkov %s"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s DA (dodane ponudbe)\n"
@@ -2608,16 +2707,16 @@ msgstr ")"
 msgid "OK"
 msgstr "V REDU"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2626,13 +2725,13 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
@@ -2642,158 +2741,187 @@ msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskočen zaradi manjkajoče zastavice OK\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je izključen: %s"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "izključevanje datoteke %s%s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "premiokanje imenika %s v %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "odpiranje %s je bilo neuspešno: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "neznana značka"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "neuspešne soodvisnosti:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "paketi za namestitev niso navedeni"
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 #, fuzzy
 msgid "Repackaging erased files..."
 msgstr "paket ne vsebuje datotek\n"
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "    --upgrade <paket>      "
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "Iskanje  %s: (z uporabo %s)...\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Prenašanje %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... kot %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "preskočeno - %s - prenos neuspešen - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ni možno namestiti\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "ni paketov\n"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "paketa %s ni možno premakniti\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "binarni paket v starem zapisu\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "napaka pri branju iz datoteke %s\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "datoteka %s zahteva novejšo različico RPM\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "noben paket ne proži %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "najdeno %d izvornih in %d binarnih paketov\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "neuspešne soodvisnosti:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "nameščanje binarnih paketov\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ni možno odpreti datoteke %s: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" določa več paketov\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ni možno odpreti %s: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Nameščanje %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "Prenašanje %s\n"
+
 #: lib/rpmlead.c:56
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
@@ -2808,7 +2936,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2835,6 +2963,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- ni podprt za nize"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2911,175 +3044,230 @@ msgstr " je v sporu z %s-%s-%s\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "manjka drugi ,:` v %s:%d"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "manjkajoče ime arhitekture v %s:%d"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Nepopolna podatkovna vrstica v %s:%d"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Preveč argumentov v podatkovni vrstici v %s:%d"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Okvarjena številka arh./op.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Nepopolna privzeta vrstica v %s:%d"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Preveč argumentov v privzeti vrstici v %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Neuspešno branje %s: %s."
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "manjkajoči ,:` (najden 0x%02x) v %s:%d"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "manjkajoči argument za %s v %s:%d"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "razširitev %s je bila neuspešna v %s:%d \"%s\""
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "ni možno odpreti %s v %s:%d: %s"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "manjkajoča arhitektura za %s v %s:%d"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "nepravilna izbira ,%s` v %s:%d"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznan sistem: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Prosimo, pišite na rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "Ni možno razširiti %s"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, fuzzy, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Ni možno prebrati %s, HOME je prevelik."
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s ni možno odpreti za branje: %s."
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "zbirko podatkov paketov ni možno odpreti v %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "neveljavna številka paketa: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "Manjkajoči ,(` v %s %s"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "neveljavna številka paketa: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "datoteke %s/packages.rpm ni mogožno odpreti\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "vrstica: %s"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "izvori v: %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "zbiranje seznama priklopljenih datotečnih sistemov.\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "premikanje %s v %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3096,6 +3284,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3120,6 +3309,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3192,6 +3382,9 @@ msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3216,44 +3409,167 @@ msgstr "Glava je predolga"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "preskoči vse podpise MD5"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dolž. polnila : %d\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izključevanje imenika %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "paket ne vsebuje skupine\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "noben paket ne proži %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "ni paketov\n"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "ni paketov\n"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "napaka pri branju glave paketa\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3262,11 +3578,16 @@ msgstr "izključevanje imenika %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+#, fuzzy
+msgid "running pre-transaction scripts\n"
+msgstr "poganjanje prednamestitvenih skript (če obstajajo)\n"
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3275,7 +3596,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3283,13 +3604,38 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+#, fuzzy
+msgid "running post-transaction scripts\n"
+msgstr "poganjanje poodnamestitvenih skriptov (če obstajajo)\n"
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "manjka     %s\n"
 
 #: lib/verify.c:437
@@ -3322,137 +3668,137 @@ msgstr "odstranjeno db okolje %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "odpiranje db okolja %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "zaprto  db kazalo       %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "zaprto  db kazalo       %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "odpiranje db kazala       %s/%s %s način=0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ni možno zakleniti z %s datotek %s/%s\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "izključujoče"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "skupno"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "zaklenjeno  db kazalo       %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, fuzzy, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "dbiSetConfig: neprepoznana izbira db: \"%s\" prezrto\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s ima neveljavno številčno vrednost, prezrto\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s ima preveliko ali premajhno dolgo (long) vrednost, prezrto\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 "%s ima preveliko ali premajhno vrednost malega (small) celega\n"
 "števila, prezrto\n"
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "manjkajoči { za %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "manjkajoči } za %{"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "oblika značke manjka"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "ime značke manjka"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "neznana značka"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "na koncu polja je pričakovan ]"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "nepričakovan ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "nepričakovan }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "v izrazu je pričakovan ?"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "v izrazu je za { pričakovan ?"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "v izrazu je pričakovan }"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "za podizrazom ? je pričakovano :"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "v izrazu je za : pričakovan {"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "na koncu izraza je pričakovan |"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3479,331 +3825,331 @@ msgstr "poizvedba po datoteki spec"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: neprepoznano ime značke: \"%s\" prezrto\n"
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "ni možno odpreti kazala %s z uporabo db%d - %s (%d)"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "ni možno odpreti kazala %s:"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ni možno prebrati glave pri 0x%x"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstranjevanje %d vnosov iz kazala %s\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "napaka(%d) pri iskanju paketa %s\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "dodajanje \"%s\" v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "dodajanje %d vnosov v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "začasna podatkovna zbirka %s že obstaja"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiranje stare podatkovne zbirke\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "zapis št. %d v zbirki je poškodovan -- preskočeno."
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "zapisa ni možno dodati na %d"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke je bila neuspešna; stara ostaja na\n"
 "istem mestu\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspešna!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "odstranjevanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspešna odstranitev imenika %s: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktivni %d prazni %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(prazni)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prazni)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s vsebuje nezaključeno telo"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, fuzzy, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s vsebuje nezaključene izbire"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, fuzzy, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s vsebuje prazno telo"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, fuzzy, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s se ne razširi"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, fuzzy, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, fuzzy, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznana izbira %c v %s(%s)"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, fuzzy, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Globina rekurzije (%d) večja od maksimalne (%d)"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Nezaključeni %c: %s"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, fuzzy, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Oznaki %% sledi nerazčlenljiv makro"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Makro %%%.*s ni najden - preskočeno"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 #, fuzzy
 msgid "Target buffer overflow\n"
 msgstr "Ciljni medpomnilnik je bil prekoračen"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "Datoteka %s: %s"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, fuzzy, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Datoteka %s je krajša od %d bajtov"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "Uspeh"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Nepravilen odziv strežnika"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 #, fuzzy
 msgid "Server I/O error"
 msgstr "V/I napaka na strežniku"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "Čas odziva strežnika je potekel"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "Naslov strežnika ni ugotovljiv"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "Ime strežnika ni bilo ugotovljivo"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "Neuspešen poskus priključitve na strežnik"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "Neuspešna vzpostavitev podatkovne povezave s strežnikom"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "V/I napaka na lokalni datoteki"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Napaka pri nastavitvi oddaljenega strežnika v pasivni način"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Datoteke ni možno najti na strežniku"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "Prekinitev v teku"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "Neznana ali nepričakovana napaka"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prijava na %s kot %s, geslo %s\n"
@@ -3814,6 +4160,7 @@ msgid "(no error)"
 msgstr "(napaka 0x%x)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "usodna napaka: "
@@ -3833,93 +4180,61 @@ msgstr "opozorilo: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "alokacija pomnilnika (%u bajtov) vrnjeno NIČ.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "opozorilo: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "opozorilo: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, fuzzy, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "opozorilo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Geslo za %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "napaka: vrata %s morajo biti številka\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "vrata URL morajo biti številka\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "neuspešno ustvarjanje %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "preveri podpis paketa(-ov)"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
+#: tools/rpmcache.c:519
 #, fuzzy
-msgid "don't change directories"
-msgstr "ustvarjanje imenika: %s\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr ""
+msgid "File tree walk options:"
+msgstr "Dolž. podpisa : %d\n"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: odpiranje je bilo neuspešno: %s\n"
@@ -4016,6 +4331,26 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
+
+#, fuzzy
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "vrstica %d: Ime datoteke ni dovoljeno: %s"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "namesti, četudi paket piše prek že nameščene datoteke"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "poizvedba po %s je bila neuspešna\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "poizvedba po izvornih paketih v stari obliki ni možna\n"
+
+#, fuzzy
+#~ msgid "no packages\n"
+#~ msgstr "ni paketov\n"
+
 #, fuzzy
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "izključevanje datoteke %s%s\n"
@@ -4066,10 +4401,6 @@ msgstr ""
 #~ msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
 
 #, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "poganjanje ponamestitvenih skript (če obstajajo)\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr "skript se ni uspešno izvedel"
@@ -5177,9 +5508,6 @@ msgstr ""
 #~ msgid "stopping install as we're running --test\n"
 #~ msgstr "ustavljanje namestitev, ker tečemo kot --test\n"
 
-#~ msgid "running preinstall script (if any)\n"
-#~ msgstr "poganjanje prednamestitvenih skript (če obstajajo)\n"
-
 #, fuzzy
 #~ msgid "removal of %s failed: %s\n"
 #~ msgstr "odstranitev %s je bila neuspešna: %s"
@@ -5187,9 +5515,6 @@ msgstr ""
 #~ msgid "will remove files test = %d\n"
 #~ msgstr "datoteke bomo odstranili, test = %d\n"
 
-#~ msgid "running postuninstall script (if any)\n"
-#~ msgstr "poganjanje poodnamestitvenih skriptov (če obstajajo)\n"
-
 #, fuzzy
 #~ msgid ""
 #~ "retrieval of return code of %s scriptlet from %s-%s-%s failed, waitpid "
@@ -5318,9 +5643,6 @@ msgstr ""
 #~ msgid "removing 0 %s entries.\n"
 #~ msgstr "odstranjevanje 0 %s vnosov.\n"
 
-#~ msgid "adding 0 %s entries.\n"
-#~ msgstr "dodajanje vnosov 0 %s.\n"
-
 #~ msgid "error creating directory %s: %s"
 #~ msgstr "napaka pri ustvarjanju imenika %s: %s"
 
@@ -5689,9 +6011,6 @@ msgstr ""
 #~ msgid "package %s not listed in %s"
 #~ msgstr "paket %s ni naveden v %s"
 
-#~ msgid "package has no group\n"
-#~ msgstr "paket ne vsebuje skupine\n"
-
 #~ msgid "removing provides index for %s\n"
 #~ msgstr "odstranjujemo seznam ponudb za %s\n"
 
diff --git a/po/sr.po b/po/sr.po
index 0e528d194..2a9502a5a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
 #: build.c:40
@@ -64,11 +64,12 @@ msgid "Building for target %s\n"
 msgstr "greška potrage za paketom %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr ""
 
 #: rpm2cpio.c:60
-#, fuzzy
+#, fuzzy, c-format
 msgid "error reading header from package\n"
 msgstr "greška potrage za paketom %s\n"
 
@@ -85,169 +86,174 @@ msgstr ""
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+msgid "Source options (with --query or --verify):"
+msgstr ""
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzija %s\n"
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Možete slobodno distribuirati dalje pod odredbama GNU GPL"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "samo jedan glavni režim može biti naveden"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo jedan tip upita/provere može biti urađen odjednom"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neočekivan izvor upita"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neočekivan izvor upita"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "neočekivan izvor upita"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "samo instalacija i ažuriranje mogu biti forsirane"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "datoteke mogu biti premeštene samo tokom instalacije paketa"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate možete koristiti samo kad instalirate novi paket"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix možete koristiti samo kod instalacije novog paketa"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti za --prefix moraju početi znakom /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles možete koristiti samo kod instalacije paketa"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "samo jedno možete da navedete: --excludedocs ili --includedocs"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches možete koristiti samo kod brisanja paketa"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -255,14 +261,14 @@ msgid ""
 msgstr ""
 "--nodeps možete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test možete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -270,85 +276,88 @@ msgstr ""
 "--root (-r) možete navesti samo kod instalacije, uklanjanja, upita ili "
 "rekreiranja baze podataka"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti za --root (-r) moraju početi znakom /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmqv.c:565
-#, fuzzy
+#: rpmqv.c:568
+#, fuzzy, c-format
 msgid "pgp not found: "
 msgstr "Datoteka nije pronađena na serveru"
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Neuspela provera lozinke\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Lozinka je dobra.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign se može koristiti samo kod kreiranja paketa"
 
-#: rpmqv.c:605
-#, fuzzy
+#: rpmqv.c:608
+#, fuzzy, c-format
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "nedostaju argumenti za upit"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Ne mogu da otvorim %s za čitanje: %s"
@@ -430,176 +439,176 @@ msgstr ""
 msgid "syntax error in expression\n"
 msgstr "očekivan znak ? u izrazu"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "nedostaje { posle %"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "nedostaje ':' na %s:%d"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, fuzzy, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "nedostaje { posle %"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:608
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: build/files.c:609
+#: build/files.c:618
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: build/files.c:621
+#: build/files.c:630
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, fuzzy, c-format
 msgid "Two files on one line: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:981
+#: build/files.c:990
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datoteka nije pronađena na serveru"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteka nije pronađena na serveru"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "greška: ne mogu da otvorim datoteku %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "greška potrage za paketom %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -653,7 +662,7 @@ msgstr "neuspelo čitanje: %s (%d)"
 msgid "cpio_copy read failed: %s\n"
 msgstr "neuspelo čitanje: %s (%d)"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "greška: ne mogu da otvorim datoteku %s\n"
@@ -663,126 +672,126 @@ msgstr "greška: ne mogu da otvorim datoteku %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "greška: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "greška: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "greška: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "greška: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "greška: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "greška: čini se da %s nije RPM paket\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "greška kod uzimanja sloga %s iz %s"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "napravi PGP potpis"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -827,17 +836,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "paket %s nije naveden u %s"
@@ -857,123 +866,128 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "line %d: Second %%files list\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, fuzzy, c-format
 msgid "OS is excluded: %s\n"
 msgstr "Pribavljam %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, fuzzy, c-format
 msgid "OS is not included: %s\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, fuzzy, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "\"%s\" određuje više paketa\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, fuzzy, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Ne mogu da upišem %s"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, fuzzy, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "(nepoznat tip)"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "nedostaje arhitektura za %s na %s:%d"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "fatalna greška: "
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "      Opcije odrednice paketa:"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "privremena baza podataka %s već postoji"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1052,83 +1066,88 @@ msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: build/parseReqs.c:113
-#, fuzzy, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "paket %s nije naveden u %s"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, fuzzy, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, fuzzy, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, fuzzy, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "premeštanja moraju početi znakom '/'"
+
+#: build/parseScript.c:209
 #, fuzzy, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, fuzzy, c-format
 msgid "line %d: Second %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "paket %s nije naveden u %s"
+
+#: build/parseSpec.c:201
 #, fuzzy, c-format
 msgid "line %d: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "paket %s nije naveden u %s"
@@ -1267,20 +1286,20 @@ msgstr "nemoj proveravati zavisnosti paketa"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "proveri potpis u paketu"
@@ -1386,81 +1405,92 @@ msgstr ""
 msgid " failed - "
 msgstr "PGP omanuo"
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "paket %s nije instaliran\n"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "upit nad svim paketima"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr ""
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(nije broj)"
 
@@ -1473,7 +1503,7 @@ msgstr "(nije broj)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(nije broj)"
@@ -1482,7 +1512,7 @@ msgstr "(nije broj)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "preskoči sve PGP potpise"
@@ -1502,7 +1532,7 @@ msgstr "mntctl() nije vratio 'fugger' veličinu: %s"
 msgid "failed to stat %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -1576,268 +1606,310 @@ msgstr "neuspelo otvaranje %s: %s\n"
 msgid "%s created as %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "greška uklanjanja sloga %s u %s"
+
+#: lib/misc.c:39
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, fuzzy, c-format
 msgid "error creating temporary file %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podržani u ovoj verziji RPM-a"
 
-#: lib/package.c:786
+#: lib/package.c:794
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podržani u ovoj verziji RPM-a"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "greška kod kreiranja direktorijuma %s: %s"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "napiši verziju rpm-a koja se koristi"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr ""
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "pošalji standardni izlaz u <komandu>"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "koristi <dir> kao direktorijum najvišeg nivoa"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "napiši verziju rpm-a koja se koristi"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr ""
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr ""
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "premeštanja moraju početi znakom '/'"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "premeštanja moraju imati znak ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "premeštanja moraju imati / praćeno sa ="
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "paket nema imena"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaliraj sve datoteke, čak i konfiguracije koje bi inače bile preskočene"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1845,667 +1917,692 @@ msgstr ""
 "ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se greška ako "
 "<paket> označava više paketa)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "nemoj izvršiti nijedan skript iz paketa"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "izbriši (deinstaliraj) paket"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 #, fuzzy
 msgid "<package>+"
 msgstr "upit nad svim paketima"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "prikaži samo konfiguracione datoteke (povlači -i)"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "nemoj da instaliraš dokumentaciju"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "paket %s nije instaliran\n"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skraćenica za --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -b<faza> <spec>\t "
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "piši heš-znak (#) kako odmiče instaliranje paketa (dobro dođe sa -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "nemoj proveravati operativni sistem za paket"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "instaliraj dokumentaciju"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "ažuriraj bazu podataka, ali nemoj menjati fajl-sistem"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "instaliraj paket"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "prikaži samo konfiguracione datoteke (povlači -i)"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nemoj izvršiti nijedan skript iz paketa"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nemoj izvršiti nijedan instalacioni skript"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nemoj izvršiti nijedan instalacioni skript"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nemoj izvršiti nijedan instalacioni skript"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 "ažuriraj na staru verziju paketa (--force kod ažuriranja ovo radi automatski)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "piši procente instalacije paketa"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "premesti paket u <dir>, ako se može premestiti"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "instaliraj čak iako će paket zameniti instalirane datoteke"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "ponovo instaliraj ako je paket već prisutan"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "nemoj instalirati, ali reci da li će da radi ili ne"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "upit nad svim paketima"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "režim upita"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 #, fuzzy
 msgid "query/verify package(s) owning file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "upit nad paketom koji ima <datoteku>"
+msgid "query/verify package(s) in group"
+msgstr "paket nema imena"
 
-#: lib/poptQV.c:103
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) in group"
+msgid "query/verify a package file"
+msgstr "upit nad svim paketima"
+
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "paket nema imena"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "paket nema imena"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "upit nad svim paketima"
+msgid "query/verify package(s) with header identifier"
+msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 #, fuzzy
 msgid "rpm query mode"
 msgstr "režim upita"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 #, fuzzy
 msgid "query a spec file"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "paket nema imena"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 #, fuzzy
 msgid "query the package(s) triggered by the package"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "režim upita"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 #, fuzzy
 msgid "query/verify the package(s) which require a dependency"
 msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 #, fuzzy
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "upit za pakete koji omogućavaju <i> svojstvo"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "nedostaju argumenti za upit"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "ne mogu da pročitam zaglavlje na %d za proveru"
+
+#: lib/poptQV.c:257
 #, fuzzy
 msgid "list all configuration files"
 msgstr "prikaži samo konfiguracione datoteke (povlači -i)"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 #, fuzzy
 msgid "list all documentation files"
 msgstr "instaliraj dokumentaciju"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 #, fuzzy
 msgid "dump basic file information"
 msgstr "prikaži informacije o paketu"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 #, fuzzy
 msgid "list files in package"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "use the following query format"
 msgstr "neočekivan izvor upita"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "potpiši paket (ukloni tekući potpis)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "proveri potpis u paketu"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "potpiši paket (ukloni tekući potpis)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 #, fuzzy
 msgid "generate signature"
 msgstr "napravi PGP potpis"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "nemoj izvršiti nijednu fazu"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "neuspelo izvršavanje skripta"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, 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:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Ne mogu da upišem %s"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "greška u formatu: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(nema datoteka)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:236
+#: lib/query.c:241
 #, fuzzy
 msgid "not installed "
 msgstr "paket %s nije instaliran\n"
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(nepoznat tip)"
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "paket nema imena"
 
-#: lib/query.c:299
+#: lib/query.c:304
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paket nema imena"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, fuzzy, c-format
-msgid "open of %s failed: %s\n"
-msgstr "neuspelo otvaranje %s: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "upit nad %s neuspeo\n"
-
-#: lib/query.c:453
-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:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "nijedan paket ne aktivira %s\n"
-
-#: lib/query.c:517
-#, fuzzy
-msgid "no packages\n"
-msgstr "upit nad svim paketima"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "nepoznat tag"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s ne sadrži nijedan paket\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nijedan paket ne zahteva %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbeđuje %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "ne mogu da pročitam slog %d\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr ""
 
@@ -2604,28 +2701,28 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr ""
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr ""
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 msgstr ""
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s nije naveden u %s"
@@ -2635,158 +2732,187 @@ msgstr "paket %s nije naveden u %s"
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, fuzzy, c-format
+msgid "open of %s failed: %s\n"
+msgstr "neuspelo otvaranje %s: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "nepoznat tag"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "loše međuzavisnosti:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "nedostaje paket za instalaciju"
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr ""
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr ""
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pribavljam %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "greška: %s se ne može instalirati\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "upit nad svim paketima"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "nijedan paket ne aktivira %s\n"
+
+#: lib/rpminstall.c:638
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadrži nijedan paket\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "loše međuzavisnosti:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" određuje više paketa\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "greška: ne mogu da otvorim %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "Pribavljam %s\n"
+
 #: lib/rpmlead.c:56
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
@@ -2801,7 +2927,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2828,6 +2954,10 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+msgid "internal support for lua scripts."
+msgstr ""
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2903,174 +3033,229 @@ msgstr " se sudara sa %s-%s-%s\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, fuzzy, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "nedostaje drugo ':' na %s:%d"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, fuzzy, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "nedostaje ime arhitekture na %s:%d"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, fuzzy, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Nepotpuna linija podataka na %s:%d"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, fuzzy, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "Premnogo argumenata u liniji podataka na %s:%d"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, fuzzy, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Loš broj arhitekture/oper.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, fuzzy, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Nepotpuna podrazumevana linija na %s:%d"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, fuzzy, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "Premnogo argumenata u podrazumevanoj liniji na %s:%d"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Neuspelo čitanje %s: %s."
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "nedostaje ':' na %s:%d"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, fuzzy, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "nedostaje argument za %s na %s:%d"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, fuzzy, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "nedostaje arhitektura za %s na %s:%d"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, fuzzy, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "loša opcija '%s' na %s:%d"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, fuzzy, c-format
 msgid "Cannot expand %s\n"
 msgstr "greška: ne mogu da otvorim %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Ne mogu da otvorim %s za čitanje: %s"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "nedostaje { posle %"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "pogrešan broj paketa: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr ""
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "greška kod kreiranja direktorijuma %s: %s"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3087,6 +3272,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3111,6 +3297,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3183,6 +3370,9 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3206,44 +3396,167 @@ msgstr ""
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "instaliraj paket"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "preskoči sve MD5 potpise"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "paket nema imena"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "nijedan paket ne aktivira %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "upit nad svim paketima"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "upit nad svim paketima"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "greška potrage za paketom %s\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3252,11 +3565,15 @@ msgstr "greška kod kreiranja direktorijuma %s: %s"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3265,7 +3582,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3273,13 +3590,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "nedostaje { posle %"
 
 #: lib/verify.c:437
@@ -3312,137 +3653,137 @@ msgstr ""
 msgid "opening  db environment %s/%s %s\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, fuzzy, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, fuzzy, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ne mogu da dobijem %s zaključavanje baze podataka"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "deljeno"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "nedostaje { posle %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "nedostaje } posle %"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "prazan 'tag' format'"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "prazno ime tag-a"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "nepoznat tag"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "] očekivano na kraju niza"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "neočekivano ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "neočekivano }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "očekivan znak ? u izrazu"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ očekivano posle ? u izrazu"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "} očekivano u izrazu"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "očekivano : praćeno ? podizrazom"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ očekivano posle : u izrazu"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "| očekivano na kraju izraza"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3469,334 +3810,334 @@ msgstr "upit nad %s neuspeo\n"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "greška: ne mogu da otvorim %s\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath nije određen"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "greška kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "greška zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "ne mogu da pročitam zaglavlje na %d za proveru"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "greška kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "greška kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "greška zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "greška kod potrage za paketom %s\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "greška uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "greška zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "dbpath nije određen"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "privremena baza podataka %s već postoji"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeće baze"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "slog broj %d u bazi podataka je neispravan -- preskačem ga"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "(nepoznat tip)"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, fuzzy, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, fuzzy, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "paket %s nije nađen u %s"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, fuzzy, c-format
 msgid "File %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 #, fuzzy
 msgid "Bad server response"
 msgstr "Loš odgovor FTP servera"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 #, fuzzy
 msgid "Server I/O error"
 msgstr "Ulazno/izlazna FTP greška"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 #, fuzzy
 msgid "Server timeout"
 msgstr "Tajm-aut FTP servera"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Ne mogu da odredim host adresu FTP servera"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Ne mogu da odredim ime FTP hosta"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Ne mogu da se povežem sa FTP serverom"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 #, fuzzy
 msgid "I/O error to local file"
 msgstr "Ulazno/izlazna greška kod lokalne datoteke"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Greška kod stavljanja udaljenog servera u pasivni režim"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Datoteka nije pronađena na serveru"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neočekivana ili nepoznata FTP greška"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3807,6 +4148,7 @@ msgid "(no error)"
 msgstr "greška: "
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "fatalna greška: "
@@ -3826,94 +4168,61 @@ msgstr "upozorenje: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lozinka za %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "greška: FTP port mora biti broj\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "greška: FTP port mora biti broj\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "proveri potpis u paketu"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
-#, fuzzy
-msgid "don't change directories"
-msgstr "greška kod kreiranja direktorijuma %s: %s"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
+#: tools/rpmcache.c:519
+msgid "File tree walk options:"
 msgstr ""
 
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr ""
-
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Neuspelo otvaranje\n"
@@ -4010,6 +4319,26 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles možete koristiti samo kod instalacije paketa"
+
+#, fuzzy
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "paket %s nije naveden u %s"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "instaliraj čak iako će paket zameniti instalirane datoteke"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "upit nad %s neuspeo\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "Upit se ne može izvesti nad izvorni paketima u starom formatu\n"
+
+#, fuzzy
+#~ msgid "no packages\n"
+#~ msgstr "upit nad svim paketima"
+
 #, fuzzy
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "Pribavljam %s\n"
@@ -4054,10 +4383,6 @@ msgstr ""
 #~ msgstr "Stari (interni) potpis!  Odakle vam!?"
 
 #, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "nemoj izvršiti nijednu fazu"
-
-#, fuzzy
 #~ msgid ""
 #~ "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 #~ msgstr "neuspelo izvršavanje skripta"
@@ -5176,10 +5501,6 @@ msgstr ""
 #~ msgstr "paket %s nije naveden u %s"
 
 #, fuzzy
-#~ msgid "package has no group\n"
-#~ msgstr "paket nema imena"
-
-#, fuzzy
 #~ msgid "removing requiredby index for %s\n"
 #~ msgstr "greška uklanjanja sloga %s u %s"
 
diff --git a/po/sv.po b/po/sv.po
index c033064b7..e526ed366 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.2\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\n"
 "PO-Revision-Date: 2003-02-05 12:40+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: build.c:40
 msgid "Failed build dependencies:\n"
@@ -62,10 +62,12 @@ msgid "Building for target %s\n"
 msgstr "Bygger för mĺlet %s\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "argumentet är inte ett RPM-paket\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "fel vid läsning av pakethuvud\n"
 
@@ -82,151 +84,158 @@ msgstr "Frĺgeflaggor (med -q eller --query):"
 msgid "Verify options (with -V or --verify):"
 msgstr "Verifieringsflaggor (med -V eller --verify):"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "Verifieringsflaggor (med -V eller --verify):"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "Signaturflaggor:"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "Databasflaggor:"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Byggflaggor med [ <specfil> | <tar-arkiv> | <källpaket> ]:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr "Installations-/Uppdaterings-/Raderingsflaggor"
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
-msgstr "Gemensamma flaggor för alla rpm-lägen:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+msgid "Common options for all rpm modes and executables:"
+msgstr "Gemensamma flaggor för alla rpm-lägen och binärer:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpmqv.c:136
+#: rpmqv.c:144
+#, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright Š 1998-2002 - Red Hat, Inc.\n"
 
-#: rpmqv.c:137
+#: rpmqv.c:145
+#, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Detta program kan distribueras fritt enligt villkoren i GNU GPL\n"
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Internt fel i argumenthantering (%d) :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "enbart ett huvudläge kan anges"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "endast en typ av frĺga/verifiering kan utföras ĺt gĺngen"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "oväntade frĺgeflaggor"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "oväntat frĺgeformat"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "oväntad frĺgekälla"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr "filer kan relokeras endast under paketinstallation"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "kan inte använda --prefix med --relocate eller --excludepath"
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate och --excludepath kan endast användas när nya paket installeras"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan endast användas när nya paket installeras"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "argument till --prefix mĺste börja med /"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles kan enbart användas vid paketinstallation"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "enbart en av --excludedocs och --includedocs kan användas"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan enbart användas när paket raderas"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb kan enbart användas när paket installeras eller raderas"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -234,7 +243,7 @@ msgstr ""
 "skriptinaktiveringsflaggor kan enbart användas när paket installeras eller "
 "raderas"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -242,7 +251,7 @@ msgstr ""
 "utlösarinaktiveringsflaggor kan enbart användas när paket installeras eller "
 "raderas"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -250,13 +259,13 @@ msgstr ""
 "--nodeps kan enbart användas när paket byggs, byggs om, kompileras om, "
 "installeras, raderas eller verifieras"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test kan enbart användas när paket installeras, raderas eller byggs"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -264,81 +273,86 @@ msgstr ""
 "--root (-r) kan enbart användas när paket installeras, raderas, frĺgas eller "
 "databasen byggs om"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argument till --root (-r) mĺste börja med /"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "inga filer att signera\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan inte komma ĺt filen %s\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp hittades inte: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Ange lösenfras: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Kontrollen av lösenfrasen misslyckades\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Lösenfrasen är ok.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Felaktig %%_signature-spec i makrofil.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign kan enbart användas vid paketbyggnation"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna för ombyggnation"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "inga specfiler angivna för byggnation"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna för byggnation"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 msgid "no packages given for erase"
 msgstr "inga paket angivna att radera"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "inga paket angivna för installation"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna för frĺga"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna för verifiering"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 msgid "no arguments given"
 msgstr "inga argument angivna"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Kan inte öppna temporär fil.\n"
 
@@ -417,169 +431,169 @@ msgstr "&& och || stöds inte för strängar\n"
 msgid "syntax error in expression\n"
 msgstr "syntaxfel i uttryck\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK-fel: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "\"(\" saknas i %s %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "\")\" saknas i %s(%s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Ogiltigt %s-element: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s saknas i %s %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "Annat än blanktecken följer pĺ %s(): %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Felaktig syntax: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "Felaktig rättighetsspecifikation: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "Felaktig specifikation av katalogrättigheter: %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "Ovanlig lokallängd: \"%.*s\" i %%lang(%s)\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "Duplicerad lokal %.*s i %%lang(%s)\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "Slog i gränsen för %%docdir\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "Endast ett argument till %%docdir\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Tvĺ filer pĺ en rad: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Filnamn mĺste börja med \"/\": %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan inte blanda special %%doc med andra former: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Filen uppräknad tvĺ gĺnger: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolisk länk pekar pĺ BuildRoot: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Filen matchar inte prefixet (%s): %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Filen hittades inte: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: läsning av publik nyckel misslyckades.\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: inte en publik nyckel med skal.\n"
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: läsning av publik nyckel misslyckades.\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Filen behöver inledande \"/\": %s\n"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Matchning inte tillĺtet: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Hittade ingen fil vid matchningen: %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunde inte öppna %%files-fil %s: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "rad: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Felaktig fil: %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Felaktig ägare/grupp: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Letar efter opackade fil(er): %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -588,7 +602,7 @@ msgstr ""
 "Installerade (men opaketerade) filer funna:\n"
 "%s"
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Bearbetar filer: %s-%s-%s\n"
@@ -642,7 +656,7 @@ msgstr "cpio_copy kunde inte skriva: %s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy kunde inte läsa: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunde inte öppna PreIn-fil: %s\n"
@@ -652,122 +666,122 @@ msgstr "Kunde inte öppna PreIn-fil: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunde inte öppna PreUn-fil: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunde inte öppna PostIn-fil: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunde inte öppna PostUn-fil: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunde inte öppna VerifyScript-fil: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Kunde inte öppna Trigger-skriptfil: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: öppna %s: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: läs %s: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek misslyckades: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s är inte ett RPM-paket\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: läser huvud frĺn %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 msgid "Unable to create immutable header region.\n"
 msgstr "Kan inte skapa oföränderlig huvudregion.\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 msgid "Unable to write temp header\n"
 msgstr "Kan inte skriva temporärhuvud\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "Felaktig CSA-data\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 msgid "Unable to write final header\n"
 msgstr "Kan inte skriva slutligt huvud\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererar signatur: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 msgid "Unable to reload signature header.\n"
 msgstr "Kan inte läsa om signaturhuvud.\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kan inte läsa signaturen %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kan inte läsa huvud frĺn %s: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kan inte skriva huvud till %s: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kan inte läsa last frĺn %s: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -812,17 +826,17 @@ msgstr "ingen beskrivning i %%changelog\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "rad %d: Fel i tolkning av %%description: %s\n"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "rad %d: otillĺten flagga %s: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "rad %d: För mĺnga namn: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "rad %d: Paketet existerar inte: %s\n"
@@ -842,123 +856,128 @@ msgstr "rad %d: Fel i tolkning av %%files: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "rad %d: En andra %%files-lista\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Arkitekturen är utesluten: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Arkitekturen är inte medtagen: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS är uteslutet: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS är inte medtaget: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "%s-fält mĺste finnas med i paketet: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Dubbla %s-poster i paketet: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "Kan inte öppna ikon %s: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "Kan inte läsa ikon %s: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "Okänd ikontyp: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "rad %d: Taggen tar endast ett värde: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "rad %d: Felaktig tagg: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "rad %d: Tom tagg: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "rad %d: Otillĺtet tecken \"-\" i %s: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot kan inte vara \"/\": %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "rad %d: Prefix fĺr inte sluta med \"/\": %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "rad %d: Docdir mĺste börja med \"/\": %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "rad %d: Epoch/Serial-fält mĺste vara numeriskt: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "rad %d: Felaktigt %s: bestämningar: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "rad %d: Felaktigt BuildArchitecture-format: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Internt fel: felaktig tagg %d\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Felaktig paketangivelse %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paketet existerar redan: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "rad %d: Okänd tagg: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Specfil kan inte använda BuildRoot\n"
 
@@ -1038,82 +1057,87 @@ msgid ""
 msgstr ""
 "rad %d: Beroenden mĺste börja alfanumeriskt, med \"_\" eller \"/\": %s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "rad %d: Filnamn inte tillĺtna: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "rad %d: Filnamn med version inte tillĺtet: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "rad %d: Version krävs: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "rad %d: utlösare mĺste ha --: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "rad %d: Fel vid tolkning av %s: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "rad %d: skriptprogram mĺste börja med \"/\": %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "rad %d: skriptprogram mĺste börja med \"/\": %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "rad %d: En andra %s\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "rad %d: Fel i tolkning av %%description: %s\n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "rad %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "Oavslutat %%if\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerar %d\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Fick ett %%else utan nĺgot %%if\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Fick ett %%endif utan nĺgot %%if\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "felformaterad %%include-sats\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "Hittade inga kompatibla arkitekturer att bygga\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paketet har ingen %%description: %s\n"
@@ -1244,18 +1268,18 @@ msgstr "verifiera inte byggberoenden"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "generera pakethuvuden kompatibla med (äldre) rpm[23]-paketering"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 msgid "don't verify package digest(s)"
 msgstr "verifiera inte paketkontrollsummor"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 msgid "don't verify database header(s) when retrieved"
 msgstr "verifiera inte databashuvuden när de hämtas"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 msgid "don't verify package signature(s)"
 msgstr "verifiera inte paketsignatur(er)"
 
@@ -1353,52 +1377,63 @@ msgstr "Ingen arkivfilen i huvud"
 msgid " failed - "
 msgstr " misslyckades - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "paket %s är redan tillagt, ersätter med %s\n"
+
+#: lib/depends.c:219
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s är redan tillagt, ersätter med %s\n"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr "(cachad)"
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 msgid "(rpmrc provides)"
 msgstr "(rpmrc tillhandahĺller)"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 msgid "(rpmlib provides)"
 msgstr "(rpmlib tillhandahĺller)"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 msgid "(db files)"
 msgstr "(db-filer)"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 msgid "(db provides)"
 msgstr "(db tillhandahĺller)"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 msgid "(db package)"
 msgstr "(db-paket)"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr "ignorera paketnamnsrelation(er) [%d]\t%s -> %s\n"
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tar bort %s \"%s\" frĺn tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
@@ -1406,27 +1441,27 @@ msgstr ""
 "========== tsort:erar paket (ordning, #föregĺngare, #efterföljare, träd, "
 "djup)\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== endast efterföljare (%d byte)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsätter med tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr "rpmtsOrder misslyckades, %d element ĺterstĺr\n"
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(inte ett tal)"
 
@@ -1438,7 +1473,7 @@ msgstr "(inte base64)"
 msgid "(invalid type)"
 msgstr "(felaktig typ)"
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 msgid "(not a blob)"
 msgstr "(inte en klick)"
 
@@ -1447,7 +1482,7 @@ msgstr "(inte en klick)"
 msgid "(invalid xml type)"
 msgstr "(felaktig typ)"
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 msgid "(not an OpenPGP signature)"
 msgstr "(inte en OpenPGP-signatur)"
 
@@ -1466,7 +1501,7 @@ msgstr "mntctl() kunde inte returnera monteringspunkter: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "kunde inte ta status pĺ %s: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
@@ -1541,259 +1576,308 @@ msgstr "%s unlink av %s misslyckades: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s skapades som %s\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "lägger till %d poster till %s-indexet.\n"
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan inte skapa %%%s %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "fel när tämporärfil %s skapades\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr "klickstorlek(%d): FEL, 8 + 16 * il(%d) + dl(%d)\n"
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "tagg[%d]: FEL, tagg %d typ %d position %d antal %d\n"
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr "regionposition: FEL, tagg %d typ %d position %d antal %d\n"
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr "regionavslutning: FEL, tagg %d typ %d position %d antal %d\n"
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr "regionstorlek: FEL, ril(%d) > il(%d)\n"
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr "hvd SHA1: FEL, ej hex\n"
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr "hvd DSA: FEL, ej binär\n"
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr "endast V3-signaturer kan verifieras, hoppar över V%u-signatur\n"
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr "hvdstorlek(%d): FEL, läsning returnerade %d\n"
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr "hvdmagi: FEL\n"
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr "hvdtaggar: FEL, antal taggar(%d) utanför intervall\n"
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr "hvddata: FEL, antal byte(%d) utanför intervall\n"
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr "hvdklick(%d): FEL, läsning returnerade %d\n"
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr "hvdlast: FEL\n"
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature misslyckades: %s"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tillgänglig\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: headerRead misslyckades: %s"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
 
+#: lib/poptALL.c:225
+#, fuzzy
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr "följ kommandoradssymlänkar"
+
 #: lib/poptALL.c:227
+#, fuzzy
+msgid "FTS_LOGICAL: logical walk"
+msgstr "genomlöp logiskt"
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "byt inte katalog"
+
+#: lib/poptALL.c:231
+#, fuzzy
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr "hämta inte statusinfo"
+
+#: lib/poptALL.c:233
+#, fuzzy
+msgid "FTS_PHYSICAL: physical walk"
+msgstr "genomlöp fysiskt"
+
+#: lib/poptALL.c:235
+#, fuzzy
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr "returnera punkt som punkt-punkt"
+
+#: lib/poptALL.c:237
+#, fuzzy
+msgid "FTS_XDEV: don't cross devices"
+msgstr "gĺ inte mellan enheter"
+
+#: lib/poptALL.c:239
+#, fuzzy
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr "returnera belyst information"
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr "fördefiniera MAKRO till värdet UTTR"
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr "'MAKRO UTTR'"
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr "definiera MAKRO till värdet UTTR"
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 msgid "print macro expansion of EXPR"
 msgstr "skriv ut makroexpansion av UTTR"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr "'UTTR'"
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "läs <FIL:...> istället för standardfil(er)"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr "<FIL:...>"
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "inaktivera användningen av libio(3)-API:et"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 msgid "send stdout to CMD"
 msgstr "skicka standard ut till KMD"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr "KMD"
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 msgid "use ROOT as top level directory"
 msgstr "använd ROT som toppnivĺkatalog"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr "ROT"
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "visa kända frĺgetaggar"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "visa slutliga rpmrc- och makrokonfigurationer"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "visa mindre detaljerad utdata"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "visa mer detaljerad utdata"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "visa vilken version av rpm som används"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 msgid "debug payload file state machine"
 msgstr "felsök lastfilstillstĺndsmaskin"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "felsök lastfilstillstĺndsmaskin"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "felsök protokolldataström"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 msgid "debug option/argument processing"
 msgstr "felsök flagg-/argumenthantering"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 msgid "debug package state machine"
 msgstr "felsök pakettillstĺndsmaskin"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "felsök pakettillstĺndsmaskin"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "felsök rpmio I/O"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "felsök cache-hanteringen av URL:ar"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: flaggtabell felkonfigurerad (%d)\n"
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "uteslutna sökvägar mĺste börja med /"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "omflyttningar mĺste börja med /"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "omflyttningar mĺste innehĺlla ett ="
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "omflyttningar mĺste ha ett / efter ="
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr "ĺterställning tar en tid-/datumstämpel som argument"
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 msgid "malformed rollback time/date stamp argument"
 msgstr "felformaterat tid-/datumstämpelargument för ĺterställning"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 msgid "add suggested packages to transaction"
 msgstr "lägg till föreslagna paket till transaktion"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "installera alla filer, även konfigurationer som annars kunde hoppats över"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1801,154 +1885,163 @@ msgstr ""
 "ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
 "anger flera paket)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr "använda anacondas \"presentationsordning\""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "kör inte paketskript"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "relokera filer i ej relokerbart paket"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr "spara raderade paketfiler genom att spara dem i underkatalog"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "radera (avinstallera) paket"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<paket>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 msgid "do not install configuration files"
 msgstr "installera inte konfigurationsfiler"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "installera inte dokumentation"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "hoppa över filer med inledande <sökväg>"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<sökväg>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "relokera filer i ej relokerbart paket"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "kortform för --replacepkgs --replacefiles"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "uppgradera paket om redan installerade"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<paketfil>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "skriv ut brädgĺrdar allteftersom paketet installeras (bra tillsammans med -v)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "verifiera inte paketarkitektur"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "verifiera inte paketets operativsystem"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "kontrollera inte diskutrymme före installation"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "installera dokumentation"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 msgid "install package(s)"
 msgstr "installera paket"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "uppdatera databasen, men ändra inte filsystemet"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "verifiera inte MD5-summor för filer"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "installera inte konfigurationsfiler"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "föreslĺ inte lösning(ar) pĺ saknade beroenden"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "utför inte (eventuellt) %%pre-skript"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "utför inte (eventuellt) %%post-skript"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "utför inte (eventuellt) %%preun-skript"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "utför inte (eventuellt) %%postun-skript"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "kör inte skript utlösta av detta paket"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "kör inte %%triggerprein-skript"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "kör inte %%triggerin-skript"
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "kör inte %%triggerun-skript"
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "kör inte %%triggerpostun-skript"
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1956,461 +2049,478 @@ msgstr ""
 "uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
 "detta automatiskt)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "skriv procent allt eftersom paketet installeras"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "flytta paketet till <katalog>, om flyttbart"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<kat>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "relokera filer frĺn <gammal> till <ny>"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<gammal>=<ny>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr "spara raderade paketfiler genom ompaketering"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "installera även om paketet byter ut installerade filer"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "ominstallera när paketet redan är installerat"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "avinstallera nya, ominstallera gamla, paket tillbaka till <datum>"
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr "<datum>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "uppgradera paket"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "frĺga/verifiera alla paket"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 msgid "rpm checksig mode"
 msgstr "rpm signaturkontrolläge"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "frĺga/verifiera paket som äger fil"
 
-#: lib/poptQV.c:101
-msgid "query/verify package(s) with file identifier"
-msgstr "frĺga/verifiera paket med filidentifierare"
-
-#: lib/poptQV.c:103
+#: lib/poptQV.c:108
 msgid "query/verify package(s) in group"
 msgstr "frĺga/verifiera paket i grupp"
 
-#: lib/poptQV.c:105
-msgid "query/verify package(s) with header identifier"
-msgstr "frĺga/verifiera paket med huvudidentifierare"
-
-#: lib/poptQV.c:107
+#: lib/poptQV.c:110
 msgid "query/verify a package file"
 msgstr "frĺga/verifiera en paketfil"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
+msgstr "frĺga/verifiera paket frĺn installationstransaktion"
+
+#: lib/poptQV.c:115
+#, fuzzy
+msgid "query/verify package(s) from system HDLIST"
+msgstr "frĺga/verifiera paket frĺn installationstransaktion"
+
+#: lib/poptQV.c:118
 msgid "query/verify package(s) with package identifier"
 msgstr "frĺga/verifiera paket som med paketidentifierare"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:120
+msgid "query/verify package(s) with header identifier"
+msgstr "frĺga/verifiera paket med huvudidentifierare"
+
+#: lib/poptQV.c:122
+msgid "query/verify package(s) with file identifier"
+msgstr "frĺga/verifiera paket med filidentifierare"
+
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "rpm frĺgeläge"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 msgid "query/verify a header instance"
 msgstr "frĺga/verifiera en huvudinstans"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "frĺga en specfil"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<spec>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 msgid "query/verify package(s) from install transaction"
 msgstr "frĺga/verifiera paket frĺn installationstransaktion"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "frĺga paket utlösta av paketet"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "rpm verifieringsläge"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "frĺga/verifiera paket som behöver ett beroende"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "frĺga/verifiera paket som tillhandahĺller ett beroende"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "inga argument angivna"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: kan inte läsa huvud vid 0x%x\n"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "lista alla konfigurationsfiler"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "lista alla dokumentationsfiler"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "visa filinformation"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "lista filer i paketet"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr "hoppa över %%ghost-filer"
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr "hoppa över %%license-filer"
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr "hoppa över %%readme-filer"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "använd följande frĺgeformat"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "ersätt översatta sektioner till specfil"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "visa tillstĺnd för de listade filerna"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "verifiera inte storlekar pĺ filer"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "verifiera inte sökvägen i symboliska länkar"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "verifiera inte ägare till filer"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "verifiera inte grupper till filer"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "verifiera inte modifikationstiden för filer"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "verifiera inte rättigheter för filer"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "verifiera inte filerna i paketet"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "verifiera inte filerna i paketet"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 msgid "don't execute verify script(s)"
 msgstr "utför inte verifieringsskript"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "verifiera inte GPG V3 DSA-signatur(er)"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "verifiera inte PGP V3 RSA/MD5-signatur(er)"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 msgid "sign package(s) (identical to --resign)"
 msgstr "signera paket (detsamma som --resign)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 msgid "verify package signature(s)"
 msgstr "verifiera paketsignatur(er)"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr "importera en publik nyckel med skal"
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signera paket (detsamma som --addsign)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "generera signatur"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr "källpaket förväntades, fann binärpaket\n"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "källpaket innehĺller ingen .spec-fil\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, fuzzy, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr "%s: waitpid(%d) rk %d status %x\n"
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: %s(%s-%s-%s) start %ssynkront skript\n"
+
 # Avslutande %s blir sökvägen till ldconfig.  Det är en körning av
 # programmet man hoppar över.  Alltsĺ: överflödig körning.
-#: lib/psm.c:631
-#, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+#: lib/psm.c:736
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr "%s: %s(%s-%s-%s) hoppar över överflödig \"%s\".\n"
 
-#: lib/psm.c:639
-#, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+#: lib/psm.c:744
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr "%s: %s(%s-%s-%s) start %ssynkront skript\n"
 
-#: lib/psm.c:818
-#, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+#: lib/psm.c:956
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
 
-#: lib/psm.c:851
-#, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+#: lib/psm.c:990
+#, fuzzy, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s) skript misslyckades, waitpid(%d) rk %d: %s\n"
 
-#: lib/psm.c:857
-#, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+#: lib/psm.c:996
+#, fuzzy, c-format
+msgid "%s(%s-%s-%s.%s) scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s) skript misslyckades, slutstatus %d\n"
 
-#: lib/psm.c:1288
+#: lib/psm.c:1429
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s har %d filer, test = %d\n"
 
-#: lib/psm.c:1423
+#: lib/psm.c:1606
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s-skript misslyckades (%d), hoppar över %s\n"
 
-#: lib/psm.c:1532
+#: lib/psm.c:1715
 msgid "Unable to reload signature header\n"
 msgstr "Kan inte läsa om signaturhuvud\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades pĺ fil %s: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "fel format: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(innehĺller inga filer)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "ersatt        "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "oinstallerat  "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "nätdelad      "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr "fel färg      "
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(ej tillstnd) "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(okänd %3d)   "
 
-#: lib/query.c:266
+#: lib/query.c:271
 msgid "package has not file owner/group lists\n"
 msgstr "paketet har inte filägare-/-grupplistor\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "paketet har varken filägare eller id-listor\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "misslyckades med att öppna %s: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "frĺga av %s misslyckades\n"
-
-#: lib/query.c:453
-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:488 lib/rpminstall.c:622
-#, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "%s: inte ett rpm-paket (eller paketspecifikation): %s\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "inga paket\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "okänd tagg"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupp %s innehĺller inga paket\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "inga paketutlösare %s\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr "felformaterad %s: %s\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr "inga paket matchar %s: %s\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "inget paket behöver %s\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "inget paket tillhandahĺller %s\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tillhör inget paket\n"
 
-#: lib/query.c:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paketpost nummer: %u\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "post %u kunde inte läsas\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 msgid "(added files)"
 msgstr "(lade till filer)"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 msgid "(added provide)"
 msgstr "(lade till tillhandahĺllande)"
 
@@ -2507,15 +2617,15 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr "JA"
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2524,13 +2634,13 @@ msgstr ""
 "\"B\"-beroendet behöver en epok (antar samma epok som \"A\")\n"
 "\tA = \"%s\"\tB = \"%s\"\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s har ouppfyllda %s: %s\n"
@@ -2540,154 +2650,183 @@ msgstr "paket %s har ouppfyllda %s: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad pĺ grund av missingok-flagga\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr "========== omflyttningar\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d utesluter  %s\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d flyttar om %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "hoppar över %s %s\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "misslyckades med att öppna %s: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "okänd tagg"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+msgid "Failed dependencies:\n"
+msgstr "Ouppfyllda beroenden:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr "    Föreslagna lösningar:\n"
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr "Förbereder paket för installation ..."
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 msgid "Repackaging..."
 msgstr "Packar om..."
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr "Packar om raderade filer..."
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 msgid "Upgrading..."
 msgstr "Uppgraderar..."
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 msgid "Upgrading packages..."
 msgstr "Uppgraderar paket..."
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, c-format
 msgid "Adding goal: %s\n"
 msgstr "Lägger till mĺl: %s\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Hämtar %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hoppar över %s - överföring misslyckades - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kan inte installeras\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<källpaket>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "paket %s är inte relokerbart\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "installerar binärpaket\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fel vid läsning frĺn fil %s\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "filen %s behöver en nyare version av RPM\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "%s: inte ett rpm-paket (eller paketspecifikation): %s\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "hittade %d käll- och %d binärpaket\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-msgid "Failed dependencies:\n"
-msgstr "Ouppfyllda beroenden:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr "    Föreslagna lösningar:\n"
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "installerar binärpaket\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kan inte öppna filen %s: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" anger flera paket\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "Ĺterställer paket (+%d/-%d) till %-24.24s (0x%08x):\n"
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "Hämtar %s\n"
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2702,7 +2841,8 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr "filnamn lagrade som (katNamn,basNam,katIndex)-tupel, inte som sökväg."
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+#, fuzzy
+msgid "package payload can be compressed using bzip2."
 msgstr "paketlast är komprimerad med bzip2."
 
 #: lib/rpmlibprov.c:38
@@ -2729,6 +2869,11 @@ msgstr "en hĺrdlänkad filuppsättning fĺr installeras utan att vara komplett."
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- stöds inte för strängar\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2803,174 +2948,229 @@ msgstr "%s stĺr i konflikt med %s%s"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "okänt fel %d uppträdde under behandling av paket %s"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "andra \":\" saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "arkitekturnamn saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "Ofullständig datarad vid %s:%d\n"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "För mĺnga argument i datarad vid %s:%d\n"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "Felaktigt arkitektur-/os-nummer: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "Ofullständig standardvärdesrad vid %s:%d\n"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "För mĺnga argument i standardvärdesrad vid %s:%d\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "Misslyckades med att läsa %s: %s.\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "\":\" saknas (hittade 0x%02x) vid %s:%d\n"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "argument till %s saknas vid %s:%d\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s expansion misslyckades vid %s:%d \"%s\"\n"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "kan inte öppna %s vid %s:%d: %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "arkitektur saknas för %s vid %s:%d\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "okänd flagga \"%s\" vid %s:%d\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Okänt system: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Var vänlig kontakta rpm-list@redhat.com\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "Kan inte expandera %s\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "Kan inte läsa %s, HOME är för stor.\n"
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kan inte öppna %s för läsning: %s.\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan inte öppna paketdatabas i %s\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "\"(\" saknas i %s %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "kan inte öppna Solve-databas i %s\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, c-format
 msgid "Adding: %s\n"
 msgstr "Lägger till: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, c-format
 msgid "Suggesting: %s\n"
 msgstr "Föreslĺr %s\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 msgid "mounted filesystems:\n"
 msgstr "monterade filsystem:\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr "    i  enhet bstrl       btillg       itillg monteringspunkt\n"
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr "%5d 0x%04x %5u %12ld %12ld %s\n"
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "flyttar %s till %s\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -2989,6 +3189,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr "sighstorlek(%d): FEL, läsning returnerade %d\n"
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr "sighmagi: FEL\n"
 
@@ -3013,6 +3214,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr "sightagg[%d]: FEL, tagg %d typ %d position %d antal %d\n"
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr "sighlast: FEL\n"
 
@@ -3080,6 +3282,9 @@ msgstr "Fick %d byte GPG-signatur\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3103,41 +3308,164 @@ msgstr "Huvud+laststorlek: "
 msgid "MD5 digest: "
 msgstr "MD5-summa: "
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 msgid "Header SHA1 digest: "
 msgstr "Huvudets SHA1-summa: "
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 msgid "V3 RSA/MD5 signature: "
 msgstr "V3 RSA/MD5-signatur: "
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr "Huvud "
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 msgid "V3 DSA signature: "
 msgstr "V3 DSA-signatur: "
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verifiera signatur: FELAKTIGA PARAMETRAR\n"
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Trasig MD5-summa: STÖDS EJ\n"
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: OKÄND (%d)\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar över katalogen %s\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "källpaket förväntades, fann binärpaket\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "inga paket matchar %s: %s\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<källpaket>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<källpaket>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "fel vid läsning av pakethuvud\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3146,11 +3474,15 @@ msgstr "hoppar över katalogen %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr "rimlighetskontrollerar %d element\n"
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3159,7 +3491,7 @@ msgstr "rimlighetskontrollerar %d element\n"
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr "beräknar %d filfingeravtryck\n"
@@ -3167,13 +3499,37 @@ msgstr "beräknar %d filfingeravtryck\n"
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr "beräknar filĺtgärder\n"
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
-#, c-format
-msgid "missing  %c %s"
+#, fuzzy, c-format
+msgid "missing   %c %s"
 msgstr "saknas   %c %s"
 
 #: lib/verify.c:437
@@ -3206,136 +3562,136 @@ msgstr "tog bort    db-miljö %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "öppnar      db-miljö %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "stängde     db-index %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "verifierade db-index %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 "odelad posix-mutex funna(%d), lägger till DB_PRIVATE, använder fcntl-lĺs\n"
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "öppnar      db-index %s/%s %s rättighet=0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan inte fĺ %s lĺs pĺ %s/%s\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "delat"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "lĺste       db-index %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "okänd db-flagga: \"%s\" ignorerad\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s har ogiltigt ogiltigt numeriskt värde, hoppar över\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n"
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "{ saknas efter %"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "} saknas efter %{"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "tomt taggformat"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "tomt taggnamn"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "okänd tagg"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "] förväntades vid slutet pĺ vektor"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "oväntad ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "oväntad }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "? förväntades i uttryck"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "{ förväntades efter ? i uttryck"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "} förväntades i uttryck"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr ": förväntades efter ? i deluttryck"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "{ förväntades efter : i uttryck"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "| förväntades vid slutet pĺ uttryck"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr "(index utanför intervall)"
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr "vektoriterator använd med vektor av annan storlek"
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3360,324 +3716,324 @@ msgstr "verifiera databasfiler"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n"
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan inte öppna %s-indexet med db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan inte öppna %s-indexet\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr "ingen dbpath har satts\n"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fel(%d) när \"%s\"-poster hämtades frĺn %s-indexet\n"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: hoppar över"
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "fel(%d) när post nr. %d sparades i %s\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: hoppar över"
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: skadat huvud nr. %u hämtat -- hoppar över.\n"
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan inte läsa huvud vid 0x%x\n"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "fel(%d) när huvudpost nr. %d  för %s skulle tas bort\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" frĺn %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "tar bort %d poster frĺn %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "fel(%d) när \"%s\"-poster frĺn %s-indexet sattes\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "fel(%d) när post \"%s\" sparades i %s\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "fel(%d) när post \"%s\" togs bort frĺn %s\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fel(%d) vid allokering av ny paketinstans\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdbAdd: hoppar över"
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "lägger till \"%s\" till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "lägger till %d poster till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fel(%d) när post %s sparades i %s\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tillfällig databas %s existerar redan\n"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "skapar katalog %s: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "öppnar gammal databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "öppnar ny databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "huvud nr. %u i databasen är felaktigt -- hoppar över.\n"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kan inte lägga till post ursprungligen vid %u\n"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer frĺn %s för att ĺterställa"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiva %d tomma %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tom)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s har oavslutad kropp\n"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "Makro %%%s har otillĺtet namn (%%define)\n"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s har oavslutade flaggor\n"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "makro %%%s har tom kropp\n"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s misslyckades att expandera\n"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "Makro %%%s har otillĺtet namn (%%undefine)\n"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "Makro %%%s (%s) användes inte under nivĺ %d\n"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Okänd flagga %c i %s(%s)\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Rekursionsdjup(%d) större än max(%d)\n"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Oavslutad %c: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Ett %% följs av ett makro som inte kan tolkas\n"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "Inget makro %%%.*s hittat, hoppar över\n"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "Mĺlbuffert översvämmad\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "Fil %s: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "Filen %s är mindre än %u byte\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "Lyckades"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Konstigt svar frĺn server"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr "IO-fel mot server"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "Förbindelsen med servern dog ut (timeout)"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "Kunde inte slĺ upp serverns adress"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "Kunde inte slĺ upp serverns namn"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "Misslyckades med att kontakta servern"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "Misslyckades med att etablera en dataförbindelse till servern"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr "I/O-fel mot lokal fil"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Fel när fjärrservern sattes i passivt läge"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Filen fanns inte pĺ servern"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "Avbruten under gĺng"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "Okänt eller oväntat fel"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "loggar in pĺ %s som %s, lösenord %s\n"
@@ -3687,6 +4043,7 @@ msgid "(no error)"
 msgstr "(inget fel)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "ödesdigert fel: "
@@ -3706,91 +4063,60 @@ msgstr "varning: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "minnesallokering (%u byte) returnerade NULL.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "varning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "varning: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "varning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lösenord för %s@%s: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "fel: %s-port mĺste vara ett tal\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "url-port mĺste vara ett tal\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 msgid "don't verify header+payload signature"
 msgstr "verifiera inte huvud+lastsignatur"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr "uppdatera inte cachedatabasen, skriv bara ut paketsökvägar"
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr "följ kommandoradssymlänkar"
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr "genomlöp logiskt"
-
-#: tools/rpmcache.c:528
-msgid "don't change directories"
-msgstr "byt inte katalog"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr "hämta inte statusinfo"
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr "genomlöp fysiskt"
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr "returnera punkt som punkt-punkt"
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr "gĺ inte mellan enheter"
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr "returnera belyst information"
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-msgid "Common options for all rpm modes and executables:"
-msgstr "Gemensamma flaggor för alla rpm-lägen och binärer:"
+#: tools/rpmcache.c:519
+#, fuzzy
+msgid "File tree walk options:"
+msgstr "Signaturflaggor:"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: %%{_cache_dbpath}-makro är felkonfigurerat.\n"
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: cacheoperation misslyckades: ec %d.\n"
@@ -3889,6 +4215,27 @@ msgstr "använd databas i KATALOG"
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "Gemensamma flaggor för alla rpm-lägen:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles kan enbart användas vid paketinstallation"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "rad %d: Filnamn inte tillĺtna: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "installera även om paketet byter ut installerade filer"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "frĺga av %s misslyckades\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "källpaket i gammalt format gĺr inte att frĺga om\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "inga paket\n"
+
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "hoppar över multilib-sökväg %s%s\n"
 
diff --git a/po/tr.po b/po/tr.po
index 412540be8..0c888c27f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-27 17:40-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 0.9.2alpha\n"
 
 #: build.c:40
@@ -64,10 +64,12 @@ msgid "Building for target %s\n"
 msgstr "%s için derleniyor\n"
 
 #: rpm2cpio.c:55
+#, c-format
 msgid "argument is not an RPM package\n"
 msgstr "argüman bir RPM paketi deđil\n"
 
 #: rpm2cpio.c:60
+#, c-format
 msgid "error reading header from package\n"
 msgstr "paketten baţlýk okunmasý sýrasýnda hata oluţtu\n"
 
@@ -84,157 +86,163 @@ msgstr "Sorgulama seçenekleri (-q ya da --query ile)"
 msgid "Verify options (with -V or --verify):"
 msgstr "Denetleme seçenekleri (-V ya da --verify ile)"
 
-#: rpmqv.c:81
+#: rpmqv.c:79
+#, fuzzy
+msgid "Source options (with --query or --verify):"
+msgstr "Denetleme seçenekleri (-V ya da --verify ile)"
+
+#: rpmqv.c:83
+msgid "File tree walk options (with --ftswalk):"
+msgstr ""
+
+#: rpmqv.c:89
 msgid "Signature options:"
 msgstr "Ýmza seçenekleri:"
 
-#: rpmqv.c:87
+#: rpmqv.c:95
 msgid "Database options:"
 msgstr "Veritabaný seçenekleri:"
 
-#: rpmqv.c:93
+#: rpmqv.c:101
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "[ <specDosyasý> | <tarPaketi> | <kaynakPaketi> ] ile paketleme seçenekleri:"
 
-#: rpmqv.c:99
+#: rpmqv.c:107
 msgid "Install/Upgrade/Erase options:"
 msgstr "Kurma/Güncelleme/Kaldýrma seçenekleri:"
 
-#: rpmqv.c:104
-msgid "Common options for all rpm modes:"
+#: rpmqv.c:112 tools/rpmcache.c:523 tools/rpmdeps.c:34 tools/rpmgraph.c:276
+#, fuzzy
+msgid "Common options for all rpm modes and executables:"
 msgstr "Tüm rpm kipleri için ortak seçenekler:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:121 lib/poptI.c:29
+#: rpmqv.c:129 lib/poptI.c:43
 #, c-format
 msgid "%s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: rpmqv.c:129 lib/poptALL.c:119
+#: rpmqv.c:137 lib/poptALL.c:123
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Sürüm %s\n"
 
-#: rpmqv.c:136
-#, fuzzy
+#: rpmqv.c:144
+#, fuzzy, c-format
 msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998 - 2000 - Red Hat, Inc."
 
-#: rpmqv.c:137
-#, fuzzy
+#: rpmqv.c:145
+#, fuzzy, c-format
 msgid ""
 "This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Bu program GNU GPL koţullarýna uygun olarak serbestçe dađýtýlabilir."
 
-#: rpmqv.c:295
+#: rpmqv.c:303
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "(%d) argümaný iţlenirken iç hata oluţtu :-(\n"
 
-#: rpmqv.c:333 rpmqv.c:339 rpmqv.c:345 rpmqv.c:382
+#: rpmqv.c:341 rpmqv.c:347 rpmqv.c:353 rpmqv.c:390
 msgid "only one major mode may be specified"
 msgstr "sadece bir ana kip belirtilebilir"
 
-#: rpmqv.c:361
+#: rpmqv.c:369
 msgid "one type of query/verify may be performed at a time"
 msgstr "bir anda sadece bir tarz sorgulama/denetleme yapýlabilir"
 
-#: rpmqv.c:365
+#: rpmqv.c:373
 msgid "unexpected query flags"
 msgstr "beklenmeyen sorgulama bayraklarý"
 
-#: rpmqv.c:368
+#: rpmqv.c:376
 msgid "unexpected query format"
 msgstr "beklenmeyen sorgulama biçemi"
 
-#: rpmqv.c:371
+#: rpmqv.c:379
 msgid "unexpected query source"
 msgstr "beklenmeyen sorgulama kaynađý"
 
-#: rpmqv.c:413
+#: rpmqv.c:421
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "sadece  kaynak ve spec silme iţlemleri, kurma, güncelleme iţlemleri için "
 "zorlanabilir"
 
-#: rpmqv.c:415
+#: rpmqv.c:423
 msgid "files may only be relocated during package installation"
 msgstr ""
 "dosyalar sadece paket kurulumu sýrasýnda yeni yerlerine yerleţtirilebilir"
 
-#: rpmqv.c:418
+#: rpmqv.c:426
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:421
+#: rpmqv.c:429
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate ve --excludepath sadece yeni paket kurulumunda kullanýlabilir"
 
-#: rpmqv.c:424
+#: rpmqv.c:432
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix sadece yeni paketlerin kurulmasý sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:427
+#: rpmqv.c:435
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ile belirtilenler '/' ile baţlamalý"
 
-#: rpmqv.c:430
+#: rpmqv.c:438
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:434
+#: rpmqv.c:442
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:439
-msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles sadece paket kurulumu sýrasýnda kullanýlabilir"
-
-#: rpmqv.c:443
+#: rpmqv.c:446
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:447
+#: rpmqv.c:450
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:451
+#: rpmqv.c:454
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:455
+#: rpmqv.c:458
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ve --includedocs bir arada kullanýlamaz"
 
-#: rpmqv.c:459
+#: rpmqv.c:462
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:463
+#: rpmqv.c:466
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:468
+#: rpmqv.c:471
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:472
+#: rpmqv.c:475
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:476
+#: rpmqv.c:479
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:481
+#: rpmqv.c:484
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb sadece paket kurulumu ve kaldýrýlmasý sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:486
+#: rpmqv.c:489
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -242,7 +250,7 @@ msgstr ""
 "betik iptal etme seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda "
 "kullanýlabilir"
 
-#: rpmqv.c:491
+#: rpmqv.c:494
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -250,7 +258,7 @@ msgstr ""
 "tetikleme iptal seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda "
 "kullanýlabilir"
 
-#: rpmqv.c:495
+#: rpmqv.c:498
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -258,7 +266,7 @@ msgstr ""
 "--nodeps sadece paket oluţturma, yeniden oluţturma, yeniden derleme, "
 "kurulum, kaldýrma ve denetleme iţlemlerinde kullanýlabilir"
 
-#: rpmqv.c:500
+#: rpmqv.c:503
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -266,7 +274,7 @@ msgstr ""
 "--test sadece paket kurulumu, kaldýrýlmasý ve oluţturulmasý iţlemlerinde "
 "kullanýlabilir"
 
-#: rpmqv.c:505
+#: rpmqv.c:508
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -274,83 +282,88 @@ msgstr ""
 "--root (-r) sadece kurulum, kaldýrma, sorgulama ve yeniden veritabaný "
 "oluţturma iţlemlerinde kullanýlabilir"
 
-#: rpmqv.c:517
+#: rpmqv.c:520
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ile verilenler '/' ile baţlamalý"
 
-#: rpmqv.c:541
+#: rpmqv.c:544
+#, c-format
 msgid "no files to sign\n"
 msgstr "imzalanacak dosya yok\n"
 
-#: rpmqv.c:546
+#: rpmqv.c:549
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "%s dosyasý bulunamýyor\n"
 
-#: rpmqv.c:565
+#: rpmqv.c:568
+#, c-format
 msgid "pgp not found: "
 msgstr "pgp bulunamadý: "
 
-#: rpmqv.c:570
+#: rpmqv.c:573
 msgid "Enter pass phrase: "
 msgstr "Anahtar parolasýný girin: "
 
-#: rpmqv.c:572
+#: rpmqv.c:575
+#, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Anahtar parolasý kontrolü baţarýsýz\n"
 
-#: rpmqv.c:576
+#: rpmqv.c:579
+#, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Anahtar parolasý dođru.\n"
 
-#: rpmqv.c:581
+#: rpmqv.c:584
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Makro dosyasýndaki %%_signature spec geçersiz.\n"
 
-#: rpmqv.c:588
+#: rpmqv.c:591
 msgid "--sign may only be used during package building"
 msgstr "--sign sadece paket oluţturulurken kullanýlabilir"
 
-#: rpmqv.c:605
+#: rpmqv.c:608
+#, c-format
 msgid "exec failed\n"
 msgstr "icra baţarýsýz\n"
 
-#: rpmqv.c:641
+#: rpmqv.c:644
 msgid "no packages files given for rebuild"
 msgstr "yeniden oluţturmak için paket dosyalarý belirtilmemiţ"
 
-#: rpmqv.c:711
+#: rpmqv.c:714
 msgid "no spec files given for build"
 msgstr "oluţturma için gerekli spec dosyasý belirtilmemiţ"
 
-#: rpmqv.c:713
+#: rpmqv.c:716
 msgid "no tar files given for build"
 msgstr "oluţturma için gereken tar dosyalarý belirtilmemiţ"
 
-#: rpmqv.c:735
+#: rpmqv.c:738
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "yüklenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:775
+#: rpmqv.c:778
 msgid "no packages given for install"
 msgstr "yüklenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:791
+#: rpmqv.c:795
 msgid "no arguments given for query"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: rpmqv.c:805
+#: rpmqv.c:810
 msgid "no arguments given for verify"
 msgstr "denetleme için hiç argüman belirtilmedi"
 
-#: rpmqv.c:820
+#: rpmqv.c:825
 #, fuzzy
 msgid "no arguments given"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: build/build.c:132 build/pack.c:497
+#: build/build.c:132 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Geçici dosya açýlamadý.\n"
 
@@ -429,176 +442,176 @@ msgstr "&& ve || dizgelerde desteklenmez\n"
 msgid "syntax error in expression\n"
 msgstr "ifadede sözdizimi hatasý\n"
 
-#: build/files.c:280
+#: build/files.c:289
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK baţarýsýz: %s\n"
 
-#: build/files.c:345 build/files.c:545 build/files.c:741
+#: build/files.c:354 build/files.c:554 build/files.c:750
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr "%s içinde '(' yok: %s\n"
 
-#: build/files.c:356 build/files.c:675 build/files.c:752
+#: build/files.c:365 build/files.c:684 build/files.c:761
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr "%s içinde ')' yok: (%s\n"
 
-#: build/files.c:394 build/files.c:700
+#: build/files.c:403 build/files.c:709
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr "Andaç %s geçersiz: %s\n"
 
-#: build/files.c:504
+#: build/files.c:513
 #, fuzzy, c-format
 msgid "Missing %s in %s %s\n"
 msgstr "%s içinde '(' yok: %s\n"
 
-#: build/files.c:561
+#: build/files.c:570
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr "%s() boţluksuz yazýlmýţ: %s\n"
 
-#: build/files.c:599
+#: build/files.c:608
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr "Sözdizimi hatasý: %s(%s)\n"
 
-#: build/files.c:609
+#: build/files.c:618
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr "mode spec hatalý: %s(%s)\n"
 
-#: build/files.c:621
+#: build/files.c:630
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "dirmode spec hatalý: %s(%s)\n"
 
-#: build/files.c:779
+#: build/files.c:788
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr "yerel uzunluđu hatalý: \"%.*s\" (%%lang(%s))\n"
 
 #. @innercontinue@
-#: build/files.c:790
+#: build/files.c:799
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr "%.*s yereli %%lang(%s) içinde tekrarlanmýţ\n"
 
-#: build/files.c:920
+#: build/files.c:929
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr "%%docdir için hit sýnýrý\n"
 
-#: build/files.c:928
+#: build/files.c:937
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr "%%docdir için sadece tek argüman\n"
 
 #. We already got a file -- error
-#: build/files.c:962
+#: build/files.c:971
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr "Bir satýrda 2 dosya: %s\n"
 
-#: build/files.c:981
+#: build/files.c:990
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr "Dosya \"/\" ile baţlamalý: %s\n"
 
-#: build/files.c:994
+#: build/files.c:1003
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Özel %%doc ile diđer formlar karýţtýrýlamaz: %s\n"
 
-#: build/files.c:1152
+#: build/files.c:1161
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Dosya iki kere gösterildi: %s\n"
 
-#: build/files.c:1291
+#: build/files.c:1300
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Sembolik bađ BuildRoot gösteriyor: %s -> %s\n"
 
-#: build/files.c:1538
+#: build/files.c:1547
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Dosya önek (%s) ile uyumsuz: %s\n"
 
-#: build/files.c:1562
+#: build/files.c:1571
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Dosya bulunamadý: %s\n"
 
-#: build/files.c:1773
+#: build/files.c:1783
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1779
+#: build/files.c:1789
 #, fuzzy, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: readLead baţarýsýz\n"
 
-#: build/files.c:1783 lib/rpmchecksig.c:580
+#: build/files.c:1793 lib/rpmchecksig.c:580
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1790
+#: build/files.c:1800
 #, fuzzy, c-format
 msgid "%s: *.te policy read failed.\n"
 msgstr "%s: readLead baţarýsýz\n"
 
-#: build/files.c:1842
+#: build/files.c:1853
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Dosya \"/\" ile içermeli: %s\n"
 
-#: build/files.c:1866
+#: build/files.c:1877
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "satýr %d: Dosya adý uygun deđil: %s\n"
 
-#: build/files.c:1883 lib/rpminstall.c:361
+#: build/files.c:1894 lib/rpminstall.c:362
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Dosya glob tarafýndan bulunamadý: %s\n"
 
-#: build/files.c:1943
+#: build/files.c:1954
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n"
 
-#: build/files.c:1954 build/pack.c:156
+#: build/files.c:1965 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "satýr: %s\n"
 
-#: build/files.c:2350
+#: build/files.c:2362
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Dosya hatalý: %s: %s\n"
 
-#: build/files.c:2362 build/parsePrep.c:50
+#: build/files.c:2374 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Kullanýcý/grup hatalý: %s\n"
 
-#: build/files.c:2406
+#: build/files.c:2418
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "arţiv paketi açýlýrken baţarýsýz%s%s: %s\n"
 
-#: build/files.c:2429
+#: build/files.c:2441
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2457
+#: build/files.c:2469
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Ýţlenen dosyalar: %s-%s-%s\n"
@@ -652,7 +665,7 @@ msgstr "cpio_copy yazma hatasý:%s\n"
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy okuma hatasý: %s\n"
 
-#: build/pack.c:222
+#: build/pack.c:222 build/pack.c:236
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn dosyasý açýlamadý: %s\n"
@@ -662,126 +675,126 @@ msgstr "PreIn dosyasý açýlamadý: %s\n"
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:243
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:243
+#: build/pack.c:250 build/pack.c:257
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:251
+#: build/pack.c:265
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:266
+#: build/pack.c:280
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Trigger betik dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:309
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s açýlýrken: %s\n"
 
-#: build/pack.c:305
+#: build/pack.c:319
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s okunurken: %s\n"
 
-#: build/pack.c:314 build/pack.c:543
+#: build/pack.c:328 build/pack.c:557
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek baţarýsýz: %s\n"
 
-#: build/pack.c:346
+#: build/pack.c:360
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s bir RPM paketi deđil\n"
 
-#: build/pack.c:351
+#: build/pack.c:365
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s baţlýđý okunuyor\n"
 
-#: build/pack.c:485
+#: build/pack.c:499
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s'den baţlýk okunamadý: %s\n"
 
-#: build/pack.c:504
+#: build/pack.c:518
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s'e baţlýk yazýlamadý: %s\n"
 
-#: build/pack.c:514
+#: build/pack.c:528
 msgid "Bad CSA data\n"
 msgstr "CSA verisi geçersiz\n"
 
-#: build/pack.c:550
+#: build/pack.c:564
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "%s'e baţlýk yazýlamadý: %s\n"
 
-#: build/pack.c:570
+#: build/pack.c:584
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Ýmza üretiliyor: %d\n"
 
-#: build/pack.c:588
+#: build/pack.c:602
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s'den baţlýk okunamadý: %s\n"
 
-#: build/pack.c:596
+#: build/pack.c:610
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: build/pack.c:632 lib/psm.c:1520
+#: build/pack.c:646 lib/psm.c:1703
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yazýlamadý: %s\n"
 
-#: build/pack.c:647
+#: build/pack.c:661
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget %s açýlamadý: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:672
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s'den baţlýk okunamadý: %s\n"
 
-#: build/pack.c:672
+#: build/pack.c:686
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s'e baţlýk yazýlamadý: %s\n"
 
-#: build/pack.c:682
+#: build/pack.c:696
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s'den payload okunamadý: %s\n"
 
-#: build/pack.c:688
+#: build/pack.c:702
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yazýlamadý: %s\n"
 
-#: build/pack.c:725 lib/psm.c:1789
+#: build/pack.c:739 lib/psm.c:1972
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yazýldý: %s\n"
 
-#: build/pack.c:798
+#: build/pack.c:812
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s paket dosyasý için çýktý dosya adý üretilemedi: %s\n"
 
-#: build/pack.c:815
+#: build/pack.c:829
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s dosyasý oluţturulamýyor: %s\n"
@@ -826,17 +839,17 @@ msgstr "%%changelog içinde açýklama yok\n"
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "satýr %d: %%description ayrýţtýrýlýrken hata: %s \n"
 
-#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:200
+#: build/parseDescription.c:60 build/parseFiles.c:56 build/parseScript.c:222
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "satýr %d: %s seçeneđi hatalý: %s\n"
 
-#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:214
+#: build/parseDescription.c:71 build/parseFiles.c:70 build/parseScript.c:236
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "satýr %d: Ýsim sayýsý fazla: %s\n"
 
-#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:223
+#: build/parseDescription.c:79 build/parseFiles.c:79 build/parseScript.c:245
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "satýr %d: Paket yok: %s\n"
@@ -856,123 +869,128 @@ msgstr "satýr %d: %%files ayrýţtýrýlýrken hata: %s\n"
 msgid "line %d: Second %%files list\n"
 msgstr "satýr %d: Ýkinci %%files listesi\n"
 
-#: build/parsePreamble.c:243
+#: build/parsePreamble.c:244
 #, c-format
 msgid "Architecture is excluded: %s\n"
 msgstr "Mimari dýţlandý: %s\n"
 
-#: build/parsePreamble.c:248
+#: build/parsePreamble.c:249
 #, c-format
 msgid "Architecture is not included: %s\n"
 msgstr "Mimari içerilmedi: %s\n"
 
-#: build/parsePreamble.c:253
+#: build/parsePreamble.c:254
 #, c-format
 msgid "OS is excluded: %s\n"
 msgstr "OS dýţlandý: %s\n"
 
-#: build/parsePreamble.c:258
+#: build/parsePreamble.c:259
 #, c-format
 msgid "OS is not included: %s\n"
 msgstr "OS içerilmedi: %s\n"
 
-#: build/parsePreamble.c:281
+#: build/parsePreamble.c:282
 #, c-format
 msgid "%s field must be present in package: %s\n"
 msgstr "Pakette %s alan mevcut olmalý: %s\n"
 
-#: build/parsePreamble.c:310
+#: build/parsePreamble.c:311
 #, c-format
 msgid "Duplicate %s entries in package: %s\n"
 msgstr "Pakette %s girdi tekrarlanmýţ: %s\n"
 
-#: build/parsePreamble.c:373
+#: build/parsePreamble.c:374
 #, c-format
 msgid "Unable to open icon %s: %s\n"
 msgstr "%s kýsayol simgesi açýlamadý: %s\n"
 
-#: build/parsePreamble.c:391
+#: build/parsePreamble.c:392
 #, c-format
 msgid "Unable to read icon %s: %s\n"
 msgstr "%s kýsayol simgesi okunamadý: %s\n"
 
-#: build/parsePreamble.c:404
+#: build/parsePreamble.c:405
 #, c-format
 msgid "Unknown icon type: %s\n"
 msgstr "bilinmeyen kýsayol simgesi türü: %s\n"
 
-#: build/parsePreamble.c:449
+#: build/parsePreamble.c:450
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "satýr %d: Etiket sadece tek dizgecik alýr: %s\n"
 
-#: build/parsePreamble.c:489
+#: build/parsePreamble.c:490
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "satýr %d: Etiket bozuk: %s\n"
 
 #. Empty field
-#: build/parsePreamble.c:497
+#: build/parsePreamble.c:498
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "satýr %d: Etiket boţ: %s\n"
 
-#: build/parsePreamble.c:520 build/parsePreamble.c:527
+#: build/parsePreamble.c:522 build/parsePreamble.c:529
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr "satýr %d:  %s içinde '-' karakteri kuraldýţý: %s\n"
 
-#: build/parsePreamble.c:588 build/parseSpec.c:426
+#: build/parsePreamble.c:590 build/parseSpec.c:472
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr "BuildRoot \"/\" olamaz: %s\n"
 
-#: build/parsePreamble.c:601
+#: build/parsePreamble.c:603
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "satýr %d: Önekler \"/\" ile bitemez: %s\n"
 
-#: build/parsePreamble.c:613
+#: build/parsePreamble.c:615
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "satýr %d: Docdir '/' ile baţlamalý: %s\n"
 
-#: build/parsePreamble.c:625
+#: build/parsePreamble.c:627
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr "satýr %d: Epoch/Serial alaný bir sayý olmalý: %s\n"
 
-#: build/parsePreamble.c:665 build/parsePreamble.c:676
+#: build/parsePreamble.c:667 build/parsePreamble.c:678
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "satýr %d: %s hatalý: niteleyiciler: %s\n"
 
-#: build/parsePreamble.c:702
+#: build/parsePreamble.c:704
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "satýr %d: BuildArchitecture biçimi hatalý: %s\n"
 
-#: build/parsePreamble.c:711
+#: build/parsePreamble.c:713
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Ýçsel hata: %d etiketi sahte\n"
 
-#: build/parsePreamble.c:872
+#: build/parsePreamble.c:815
+#, c-format
+msgid "Legacy syntax is unsupported: %s\n"
+msgstr ""
+
+#: build/parsePreamble.c:882
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Paket özellikleri hatalý: %s\n"
 
-#: build/parsePreamble.c:878
+#: build/parsePreamble.c:888
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket zaten var: %s\n"
 
-#: build/parsePreamble.c:905
+#: build/parsePreamble.c:917
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "satýr %d: Bilinmeyen etiket: %s\n"
 
-#: build/parsePreamble.c:927
+#: build/parsePreamble.c:939
 msgid "Spec file can't use BuildRoot\n"
 msgstr "Spec dosyasý BuildRoot kullanamaz\n"
 
@@ -1053,82 +1071,87 @@ msgstr ""
 "satýr %d: Bađýmlýlýk kýsaltmalarý bir alfanümerik, '_' veya '/' ile "
 "baţlamalý: %s\n"
 
-#: build/parseReqs.c:113
-#, c-format
-msgid "line %d: File name not permitted: %s\n"
-msgstr "satýr %d: Dosya adý uygun deđil: %s\n"
-
-#: build/parseReqs.c:145
+#: build/parseReqs.c:130
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr "satýr %d: Sürüm içeren dosya adý uygun deđil: %s\n"
 
-#: build/parseReqs.c:176
+#: build/parseReqs.c:161
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr "satýr %d: Sürüm gerekli: %s\n"
 
-#: build/parseScript.c:166
+#: build/parseScript.c:180
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr "satýr %d: tetikleyiciler -- içermeli: %s\n"
 
-#: build/parseScript.c:176 build/parseScript.c:239
+#: build/parseScript.c:190 build/parseScript.c:261
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr "satýr %d: %s çözümlenirken hata oluţtu: %s\n"
 
-#: build/parseScript.c:187
+#: build/parseScript.c:202
+#, fuzzy, c-format
+msgid "line %d: internal script must end with '>': %s\n"
+msgstr "satýr %d: betik programý '/' ile baţlamalý: %s\n"
+
+#: build/parseScript.c:209
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr "satýr %d: betik programý '/' ile baţlamalý: %s\n"
 
-#: build/parseScript.c:231
+#: build/parseScript.c:253
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr "satýr %d: %s saniye\n"
 
-#: build/parseSpec.c:158
+#: build/parseScript.c:296
+#, fuzzy, c-format
+msgid "line %d: unsupported internal script: %s\n"
+msgstr "satýr %d: %%description ayrýţtýrýlýrken hata: %s \n"
+
+#: build/parseSpec.c:201
 #, c-format
 msgid "line %d: %s\n"
 msgstr "satýr %d: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:210
+#: build/parseSpec.c:253
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: build/parseSpec.c:226
+#: build/parseSpec.c:269
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr "%%if kapanmamýţ\n"
 
-#: build/parseSpec.c:300
+#: build/parseSpec.c:346
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean %d ile döner\n"
 
-#: build/parseSpec.c:309
+#: build/parseSpec.c:355
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%if'siz bir  %%else alýndý\n"
 
-#: build/parseSpec.c:321
+#: build/parseSpec.c:367
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%if'siz bir %%endif alýndý\n"
 
-#: build/parseSpec.c:335 build/parseSpec.c:344
+#: build/parseSpec.c:381 build/parseSpec.c:390
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include deyimi bozuk\n"
 
-#: build/parseSpec.c:545
+#: build/parseSpec.c:593
 msgid "No compatible architectures found for build\n"
 msgstr "Kurgulamak için uyumlu mimari yok\n"
 
-#: build/parseSpec.c:606
+#: build/parseSpec.c:654
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket %%description içermiyor: %s\n"
@@ -1267,20 +1290,20 @@ msgstr "paket bađýmlýlýklarýný denetlemez"
 msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr "paket baţlýklarýný (eski) rpm[23] paketleme ile uyumlu üretir"
 
-#: build/poptBT.c:229 lib/poptALL.c:240 lib/poptI.c:261 lib/poptQV.c:335
-#: lib/poptQV.c:344 lib/poptQV.c:383
+#: build/poptBT.c:229 lib/poptALL.c:268 lib/poptI.c:283 lib/poptQV.c:362
+#: lib/poptQV.c:371 lib/poptQV.c:410
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "paket bađýmlýlýklarý dođrulanmaz"
 
-#: build/poptBT.c:231 lib/poptALL.c:242 lib/poptI.c:263 lib/poptQV.c:338
-#: lib/poptQV.c:346 lib/poptQV.c:386
+#: build/poptBT.c:231 lib/poptALL.c:270 lib/poptI.c:285 lib/poptQV.c:365
+#: lib/poptQV.c:373 lib/poptQV.c:413
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "paket mimarisi denetlenmez"
 
-#: build/poptBT.c:233 lib/poptALL.c:248 lib/poptI.c:265 lib/poptQV.c:341
-#: lib/poptQV.c:348 lib/poptQV.c:388
+#: build/poptBT.c:233 lib/poptALL.c:276 lib/poptI.c:287 lib/poptQV.c:368
+#: lib/poptQV.c:375 lib/poptQV.c:415
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "paket imzasýný denetler"
@@ -1379,57 +1402,68 @@ msgstr ""
 msgid " failed - "
 msgstr " baţarýsýz - "
 
-#: lib/depends.c:188
+#: lib/depends.c:205
+#, fuzzy, c-format
+msgid "package %s was already added, skipping %s\n"
+msgstr "%s zaten kurulu"
+
+#: lib/depends.c:219
 #, fuzzy, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "%s zaten kurulu"
 
-#: lib/depends.c:397
+#. @-nullptrarith@
+#: lib/depends.c:360
+#, c-format
+msgid "  Obsoletes: %s\t\terases %s\n"
+msgstr ""
+
+#: lib/depends.c:452
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:424
+#: lib/depends.c:479
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s EVET (rpmrc sađlar)\n"
 
-#: lib/depends.c:441
+#: lib/depends.c:496
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s EVET (rpmlib sađlar)\n"
 
-#: lib/depends.c:470
+#: lib/depends.c:525
 #, fuzzy
 msgid "(db files)"
 msgstr "db dosyasý %s hatalý\n"
 
-#: lib/depends.c:483
+#: lib/depends.c:538
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s EVET (db sađlar)\n"
 
-#: lib/depends.c:496
+#: lib/depends.c:551
 #, fuzzy
 msgid "(db package)"
 msgstr "paket yok\n"
 
-#: lib/depends.c:851
+#: lib/depends.c:910
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:972
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort bađýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n"
 
 #. Record all relations.
-#: lib/depends.c:1204
+#: lib/depends.c:1264
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort bađýntýlarý kaydediliyor\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1296
+#: lib/depends.c:1356
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1437,27 +1471,27 @@ msgid ""
 msgstr ""
 "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1441
 #, fuzzy, c-format
 msgid "========== successors only (%d bytes)\n"
 msgstr "========== sadece ardýllar (sunum sýrasý)\n"
 
-#: lib/depends.c:1451
+#: lib/depends.c:1514
 msgid "LOOP:\n"
 msgstr "ÇEVRÝM:\n"
 
-#: lib/depends.c:1486
+#: lib/depends.c:1549
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort sürüyor ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1491
+#: lib/depends.c:1554
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
 
-#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:499
-#: rpmdb/header.c:3510 rpmdb/header.c:3539 rpmdb/header.c:3563
+#: lib/formats.c:39 lib/formats.c:71 lib/formats.c:106 lib/formats.c:507
+#: rpmdb/header.c:3546 rpmdb/header.c:3575 rpmdb/header.c:3599
 msgid "(not a number)"
 msgstr "(bir sayý deđil)"
 
@@ -1470,7 +1504,7 @@ msgstr "(bir sayý deđil)"
 msgid "(invalid type)"
 msgstr ""
 
-#: lib/formats.c:206 lib/formats.c:398
+#: lib/formats.c:206 lib/formats.c:406
 #, fuzzy
 msgid "(not a blob)"
 msgstr "(bir sayý deđil)"
@@ -1479,7 +1513,7 @@ msgstr "(bir sayý deđil)"
 msgid "(invalid xml type)"
 msgstr ""
 
-#: lib/formats.c:423
+#: lib/formats.c:431
 #, fuzzy
 msgid "(not an OpenPGP signature)"
 msgstr "tüm PGP imzalarýný atlar"
@@ -1499,7 +1533,7 @@ msgstr "mntctl() sonuçlanan hatalý bađlantý yerleri nedeniyle baţarýsýz: %s\n"
 msgid "failed to stat %s: %s\n"
 msgstr "stat %s baţarýsýz: %s\n"
 
-#: lib/fs.c:157 rpmio/url.c:523
+#: lib/fs.c:157 rpmio/url.c:519
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
@@ -1574,269 +1608,311 @@ msgstr "%s / %s bađ kaldýrýlamadý: %s\n"
 msgid "%s created as %s\n"
 msgstr "%s %s olarak oluţturuldu\n"
 
-#: lib/misc.c:42
+#: lib/manifest.c:133
+#, fuzzy, c-format
+msgid "adding %d args from manifest.\n"
+msgstr "%d girdi %s indeksine ekleniyor.\n"
+
+#: lib/misc.c:39
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s dosyasý oluţturulamýyor: %s\n"
 
-#: lib/misc.c:47
+#: lib/misc.c:44
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyasýna yazýlamaz %s\n"
 
-#: lib/misc.c:189 lib/misc.c:194 lib/misc.c:200
+#: lib/misc.c:186 lib/misc.c:191 lib/misc.c:197
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr "%s geçici dosyasý oluţturulurken hata\n"
 
-#: lib/package.c:361
+#: lib/package.c:363
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:370 lib/package.c:434 lib/package.c:501 lib/signature.c:226
+#: lib/package.c:372 lib/package.c:436 lib/package.c:504 lib/signature.c:226
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:390 lib/signature.c:242
+#: lib/package.c:392 lib/signature.c:242
 #, c-format
 msgid "region offset: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:411 lib/signature.c:263
+#: lib/package.c:413 lib/signature.c:263
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:425 lib/signature.c:277
+#: lib/package.c:427 lib/signature.c:277
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:453
+#: lib/package.c:455
+#, c-format
 msgid "hdr SHA1: BAD, not hex\n"
 msgstr ""
 
-#: lib/package.c:471
+#: lib/package.c:473
+#, c-format
 msgid "hdr DSA: BAD, not binary\n"
 msgstr ""
 
-#: lib/package.c:535 lib/package.c:577 lib/package.c:888 lib/package.c:912
-#: lib/package.c:942 lib/rpmchecksig.c:813
+#: lib/package.c:539 lib/package.c:581 lib/package.c:916 lib/package.c:943
+#: lib/package.c:976 lib/rpmchecksig.c:813
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature\n"
 msgstr ""
 
-#: lib/package.c:661
+#: lib/package.c:668
 #, c-format
 msgid "hdr size(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:665
+#: lib/package.c:672
+#, c-format
 msgid "hdr magic: BAD\n"
 msgstr ""
 
-#: lib/package.c:673
+#: lib/package.c:680
 #, c-format
 msgid "hdr tags: BAD, no. of tags(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:682
+#: lib/package.c:689
 #, c-format
 msgid "hdr data: BAD, no. of bytes(%d) out of range\n"
 msgstr ""
 
-#: lib/package.c:696
+#: lib/package.c:703
 #, c-format
 msgid "hdr blob(%d): BAD, read returned %d\n"
 msgstr ""
 
-#: lib/package.c:709
+#: lib/package.c:716
+#, c-format
 msgid "hdr load: BAD\n"
 msgstr ""
 
-#: lib/package.c:777
+#: lib/package.c:785
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n"
 
-#: lib/package.c:786
+#: lib/package.c:794
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler "
 "destekleniyor\n"
 
-#: lib/package.c:798 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
+#: lib/package.c:806 lib/rpmchecksig.c:228 lib/rpmchecksig.c:728
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed: %s"
 msgstr "%s: rpmReadSignature baţarýsýz\n"
 
-#: lib/package.c:805 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
+#: lib/package.c:813 lib/rpmchecksig.c:235 lib/rpmchecksig.c:736
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ýmza bulundurmuyor\n"
 
-#: lib/package.c:852
+#: lib/package.c:880
 #, fuzzy, c-format
 msgid "%s: headerRead failed: %s"
 msgstr "%s: readLead baţarýsýz\n"
 
-#: lib/package.c:955 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
+#: lib/package.c:991 lib/rpmchecksig.c:116 lib/rpmchecksig.c:651
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread baţarýsýz: %s\n"
 
+#: lib/poptALL.c:225
+msgid "FTS_COMFOLLOW: follow command line symlinks"
+msgstr ""
+
 #: lib/poptALL.c:227
+msgid "FTS_LOGICAL: logical walk"
+msgstr ""
+
+#: lib/poptALL.c:229
+#, fuzzy
+msgid "FTS_NOCHDIR: don't change directories"
+msgstr "%s dizini oluţturuluyor\n"
+
+#: lib/poptALL.c:231
+msgid "FTS_NOSTAT: don't get stat info"
+msgstr ""
+
+#: lib/poptALL.c:233
+msgid "FTS_PHYSICAL: physical walk"
+msgstr ""
+
+#: lib/poptALL.c:235
+msgid "FTS_SEEDOT: return dot and dot-dot"
+msgstr ""
+
+#: lib/poptALL.c:237
+msgid "FTS_XDEV: don't cross devices"
+msgstr ""
+
+#: lib/poptALL.c:239
+msgid "FTS_WHITEOUT: return whiteout information"
+msgstr ""
+
+#: lib/poptALL.c:255
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:228 lib/poptALL.c:231
+#: lib/poptALL.c:256 lib/poptALL.c:259
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:230
+#: lib/poptALL.c:258
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:233
+#: lib/poptALL.c:261
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "<ifade>+ için makro açýlýmýný gösterir"
 
-#: lib/poptALL.c:234
+#: lib/poptALL.c:262
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:236 lib/poptALL.c:255 lib/poptALL.c:259
+#: lib/poptALL.c:264 lib/poptALL.c:283 lib/poptALL.c:287
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "öntanýmlý makro dosyasý yerine <dosya:...> okunur"
 
-#: lib/poptALL.c:237 lib/poptALL.c:256 lib/poptALL.c:260
+#: lib/poptALL.c:265 lib/poptALL.c:284 lib/poptALL.c:288
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:245 lib/poptALL.c:279
+#: lib/poptALL.c:273 lib/poptALL.c:307
 msgid "disable use of libio(3) API"
 msgstr "libio(3) API kullanýmýný iptal eder"
 
-#: lib/poptALL.c:251
+#: lib/poptALL.c:279
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "standart çýktýyý <KOMUT>'a gönderir"
 
-#: lib/poptALL.c:252
+#: lib/poptALL.c:280
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:263
+#: lib/poptALL.c:291
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "Üst düzey dizin olarak <dizin> kullanýlýr"
 
-#: lib/poptALL.c:264
+#: lib/poptALL.c:292
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:267
+#: lib/poptALL.c:295
 msgid "display known query tags"
 msgstr "tanýmlanmýţ sorgulama etiketlerini gösterir"
 
-#: lib/poptALL.c:269
+#: lib/poptALL.c:297
 msgid "display final rpmrc and macro configuration"
 msgstr "son rpmrc ve makro yapýlandýrmasýný gösterir"
 
-#: lib/poptALL.c:271
+#: lib/poptALL.c:299
 msgid "provide less detailed output"
 msgstr "daha az ayrýntýlý çýktý sađlar"
 
-#: lib/poptALL.c:273
+#: lib/poptALL.c:301
 msgid "provide more detailed output"
 msgstr "daha ayrýntýlý çýktý sađlar"
 
-#: lib/poptALL.c:275
+#: lib/poptALL.c:303
 msgid "print the version of rpm being used"
 msgstr "Kullanýlan RPM sürümünü verir"
 
-#: lib/poptALL.c:288
+#: lib/poptALL.c:316
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "hata ayýklama dosyasý durum motoru"
 
-#: lib/poptALL.c:290
+#: lib/poptALL.c:318
 #, fuzzy
 msgid "use threads for file state machine"
 msgstr "hata ayýklama dosyasý durum motoru"
 
-#: lib/poptALL.c:292
+#: lib/poptALL.c:320
 msgid "debug protocol data stream"
 msgstr "protokol veri akýţýnda hata kontrolu"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:325
 #, fuzzy
 msgid "debug option/argument processing"
 msgstr "(%d) argümaný iţlenirken iç hata oluţtu :-(\n"
 
-#: lib/poptALL.c:302
+#: lib/poptALL.c:330
 #, fuzzy
 msgid "debug package state machine"
 msgstr "hata ayýklama dosyasý durum motoru"
 
-#: lib/poptALL.c:304
+#: lib/poptALL.c:332
 #, fuzzy
 msgid "use threads for package state machine"
 msgstr "hata ayýklama dosyasý durum motoru"
 
-#: lib/poptALL.c:316
+#: lib/poptALL.c:346
 msgid "debug rpmio I/O"
 msgstr "rpmio G/Ç hata kontrolu"
 
-#: lib/poptALL.c:330
+#: lib/poptALL.c:360
 msgid "debug URL cache handling"
 msgstr "URL arabellek kullanýmý hata kontrolu"
 
 #. @-nullpass@
-#: lib/poptALL.c:400
+#: lib/poptALL.c:430
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
 
-#: lib/poptI.c:57
+#: lib/poptI.c:71
 msgid "exclude paths must begin with a /"
 msgstr "dýţlanan dosya yolu / ile baţlamalý"
 
-#: lib/poptI.c:71
+#: lib/poptI.c:85
 msgid "relocations must begin with a /"
 msgstr "yeniden konumlandýrma iţlemleri / ile baţlamalý"
 
-#: lib/poptI.c:74
+#: lib/poptI.c:88
 msgid "relocations must contain a ="
 msgstr "yeniden konumlandýrma iţlemleri = içermelidir"
 
-#: lib/poptI.c:77
+#: lib/poptI.c:91
 msgid "relocations must have a / following the ="
 msgstr "yeniden konumlandýrma için = den sonra bir / gerekir"
 
-#: lib/poptI.c:92
+#: lib/poptI.c:106
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:99
+#: lib/poptI.c:113
 #, fuzzy
 msgid "malformed rollback time/date stamp argument"
 msgstr "tekrarlama zamaný bozuk"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:169
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "gruptaki paketleri sorgular/denetler"
 
-#: lib/poptI.c:159
+#: lib/poptI.c:173
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "yapýlandýrmalarda atlanmýţ bile olsa tüm dosyalarý kurar"
 
-#: lib/poptI.c:163
+#: lib/poptI.c:177
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1844,157 +1920,166 @@ msgstr ""
 "<paket> ile eţlenen tüm paketleri kaldýrýr(<paket> ile çok sayýda paket "
 "belirtilmiţse normalde bir hata oluţur)"
 
-#: lib/poptI.c:168 tools/rpmgraph.c:273
+#: lib/poptI.c:182 tools/rpmgraph.c:273
 msgid "use anaconda \"presentation order\""
 msgstr ""
 
-#: lib/poptI.c:173 lib/poptI.c:245
+#: lib/poptI.c:187 lib/poptI.c:267
 msgid "do not execute package scriptlet(s)"
 msgstr "paket betikleri çalýţtýrýlmaz"
 
-#: lib/poptI.c:177
+#: lib/poptI.c:191
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "yeniden konumlanamayan paketin dosyalarýný yeniden konumlandýrýr"
 
-#: lib/poptI.c:180
+#: lib/poptI.c:195
+msgid "print dependency loops as warning"
+msgstr ""
+
+#: lib/poptI.c:199
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 "ismi deđiţtirilerek alt dizine kaydedilmek suretiyle silinen dosyalarý "
 "kaydeder"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "erase (uninstall) package"
 msgstr "paketi kaldýrýr"
 
-#: lib/poptI.c:183
+#: lib/poptI.c:202
 msgid "<package>+"
 msgstr "<paket>+"
 
-#: lib/poptI.c:186 lib/poptI.c:223
+#: lib/poptI.c:205 lib/poptI.c:245
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "tüm yapýlandýrma dosyalarýný listeler"
 
-#: lib/poptI.c:189 lib/poptI.c:228
+#: lib/poptI.c:208 lib/poptI.c:250
 msgid "do not install documentation"
 msgstr "belgeleri kurmaz"
 
-#: lib/poptI.c:191
+#: lib/poptI.c:210
 msgid "skip files with leading component <path> "
 msgstr "<dosyayolu> ile baţlayan dosyalarý atlar "
 
-#: lib/poptI.c:192
+#: lib/poptI.c:211
 msgid "<path>"
 msgstr "<dosyaYolu>"
 
-#: lib/poptI.c:195
+#: lib/poptI.c:215
+#, fuzzy
+msgid "detect file conflicts between packages"
+msgstr "yeniden konumlanamayan paketin dosyalarýný yeniden konumlandýrýr"
+
+#: lib/poptI.c:217
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs --replacefiles için kýsaltma"
 
-#: lib/poptI.c:199
+#: lib/poptI.c:221
 msgid "upgrade package(s) if already installed"
 msgstr "paket(ler) kurulu ise paket(ler)i günceller"
 
-#: lib/poptI.c:200 lib/poptI.c:216 lib/poptI.c:312
+#: lib/poptI.c:222 lib/poptI.c:238 lib/poptI.c:334
 msgid "<packagefile>+"
 msgstr "<paketDosyasý>+"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:224
 msgid "print hash marks as package installs (good with -v)"
 msgstr "paketin kurulma sürecini gösteren imler basar (-v ile)"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:227
 msgid "don't verify package architecture"
 msgstr "paket mimarisi denetlenmez"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:230
 msgid "don't verify package operating system"
 msgstr "paketin ait olduđu iţletim sistemini dođrulamaz"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:233
 msgid "don't check disk space before installing"
 msgstr "yüklemeden önce yeterli disk alaný kontrolu yapmaz"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:235
 msgid "install documentation"
 msgstr "paket ile gelen belgeleri kurar"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:238
 #, fuzzy
 msgid "install package(s)"
 msgstr "paketi kurar"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:241
 msgid "update the database, but do not modify the filesystem"
 msgstr "veri tabanýný günceller, ama dosya sistemini deđiţtirmez"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:247
 msgid "do not verify package dependencies"
 msgstr "paket bađýmlýlýklarýný denetlemez"
 
-#: lib/poptI.c:231 lib/poptQV.c:279 lib/poptQV.c:282
+#: lib/poptI.c:253 lib/poptQV.c:306 lib/poptQV.c:309
 msgid "don't verify MD5 digest of files"
 msgstr "dosyalarýn MD5 özümlemesi dođrulanmaz"
 
-#: lib/poptI.c:233
+#: lib/poptI.c:255
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "tüm yapýlandýrma dosyalarýný listeler"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:259
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "paket kurulum sýrasýný bađýmlýlýklara göre düzenlemez"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:264
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:271
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "%%pre betiđi (varsa) çalýţtýrýlmaz"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:274
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "%%post betiđi (varsa) çalýţtýrýlmaz"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:277
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "%%preun betiđi (varsa) çalýţtýrýlmaz"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:280
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "%%postun betiđi (varsa) çalýţtýrýlmaz"
 
-#: lib/poptI.c:268
+#: lib/poptI.c:290
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "bu paket tarafýndan tetiklenen hiç bir betik çalýţtýrýlmaz"
 
-#: lib/poptI.c:271
+#: lib/poptI.c:293
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "hiçbir %%triggerprein betiđi çalýţtýrýlmaz"
 
-#: lib/poptI.c:274
+#: lib/poptI.c:296
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "hiçbir %%triggerin betiđi çalýţtýrýlmaz."
 
-#: lib/poptI.c:277
+#: lib/poptI.c:299
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "hiçbir %%triggerun betiđi çalýţtýrýlmaz."
 
-#: lib/poptI.c:280
+#: lib/poptI.c:302
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "hiçbir %%triggerpostun betiđi çalýţtýrýlmaz."
 
-#: lib/poptI.c:284
+#: lib/poptI.c:306
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2002,477 +2087,494 @@ msgstr ""
 "paketin eski bir sürüme güncellenmesini sađlar (--force ayný iţi otomatik "
 "yapar)"
 
-#: lib/poptI.c:288
+#: lib/poptI.c:310
 msgid "print percentages as package installs"
 msgstr "kurulumun geliţimi yüzde olarak gösterilir"
 
-#: lib/poptI.c:290
+#: lib/poptI.c:312
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "eđer deđitirilebiliyorsa paketin yerini <dizin>'e deđiţtirir"
 
-#: lib/poptI.c:291
+#: lib/poptI.c:313
 msgid "<dir>"
 msgstr "<dizin>"
 
-#: lib/poptI.c:293
+#: lib/poptI.c:315
 msgid "relocate files from path <old> to <new>"
 msgstr "dosyalarý <eski> dizininden kaldýrýp <yeni> dizinine yerleţtirir"
 
-#: lib/poptI.c:294
+#: lib/poptI.c:316
 msgid "<old>=<new>"
 msgstr "<eski>=<yeni>"
 
-#: lib/poptI.c:297
+#: lib/poptI.c:319
 msgid "save erased package files by repackaging"
 msgstr "yeniden paketleme sýrasýnda silinen paket dosyalarýný kaydeder"
 
-#: lib/poptI.c:300
-msgid "install even if the package replaces installed files"
-msgstr "paket dosyalarý mevcut dosyalarla yer deđiţtirse bile paketi kurar"
+#: lib/poptI.c:322
+msgid "ignore file conflicts between packages"
+msgstr ""
 
-#: lib/poptI.c:303
+#: lib/poptI.c:325
 msgid "reinstall if the package is already present"
 msgstr "paketi yeniden kurar"
 
-#: lib/poptI.c:305
+#: lib/poptI.c:327
 #, fuzzy
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 "yeni paket(ler) kaldýrýlýr, geriye dönük eski paket(ler) yeniden kurulur"
 
-#: lib/poptI.c:306
+#: lib/poptI.c:328
 msgid "<date>"
 msgstr "<tarih>"
 
-#: lib/poptI.c:308
+#: lib/poptI.c:330
 msgid "don't install, but tell if it would work or not"
 msgstr "yükleme yapmaz, sadece çalýţýp çalýţmayacađýný belirtir"
 
-#: lib/poptI.c:311
+#: lib/poptI.c:333
 msgid "upgrade package(s)"
 msgstr "paket günceller"
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:102
 msgid "query/verify all packages"
 msgstr "tüm paketleri sorgular/dođrular"
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:104
 #, fuzzy
 msgid "rpm checksig mode"
 msgstr "rpm denetleme kipi"
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:106
 msgid "query/verify package(s) owning file"
 msgstr "dosyayý içeren paketleri sorgular/denetler"
 
-#: lib/poptQV.c:101
+#: lib/poptQV.c:108
+msgid "query/verify package(s) in group"
+msgstr "gruptaki paketleri sorgular/denetler"
+
+#: lib/poptQV.c:110
 #, fuzzy
-msgid "query/verify package(s) with file identifier"
-msgstr "dosyayý içeren paketleri sorgular/denetler"
+msgid "query/verify a package file"
+msgstr "tüm paketleri sorgular/dođrular"
 
-#: lib/poptQV.c:103
-msgid "query/verify package(s) in group"
+#: lib/poptQV.c:113
+#, fuzzy
+msgid "query/verify package(s) from TOP file tree walk"
 msgstr "gruptaki paketleri sorgular/denetler"
 
-#: lib/poptQV.c:105
+#: lib/poptQV.c:115
 #, fuzzy
-msgid "query/verify package(s) with header identifier"
+msgid "query/verify package(s) from system HDLIST"
+msgstr "gruptaki paketleri sorgular/denetler"
+
+#: lib/poptQV.c:118
+#, fuzzy
+msgid "query/verify package(s) with package identifier"
 msgstr "dosyayý içeren paketleri sorgular/denetler"
 
-#: lib/poptQV.c:107
+#: lib/poptQV.c:120
 #, fuzzy
-msgid "query/verify a package file"
-msgstr "tüm paketleri sorgular/dođrular"
+msgid "query/verify package(s) with header identifier"
+msgstr "dosyayý içeren paketleri sorgular/denetler"
 
-#: lib/poptQV.c:109
+#: lib/poptQV.c:122
 #, fuzzy
-msgid "query/verify package(s) with package identifier"
+msgid "query/verify package(s) with file identifier"
 msgstr "dosyayý içeren paketleri sorgular/denetler"
 
-#: lib/poptQV.c:111
+#: lib/poptQV.c:125
 msgid "rpm query mode"
 msgstr "rpm sorgulama kipi"
 
-#: lib/poptQV.c:113
+#: lib/poptQV.c:127
 #, fuzzy
 msgid "query/verify a header instance"
 msgstr "dosyayý içeren paketleri sorgular/denetler"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "query a spec file"
 msgstr "bir spec dosyasýný sorgular"
 
-#: lib/poptQV.c:115
+#: lib/poptQV.c:129
 msgid "<spec>"
 msgstr "<spec>"
 
-#: lib/poptQV.c:117
+#: lib/poptQV.c:131
 #, fuzzy
 msgid "query/verify package(s) from install transaction"
 msgstr "gruptaki paketleri sorgular/denetler"
 
-#: lib/poptQV.c:119
+#: lib/poptQV.c:133
 msgid "query the package(s) triggered by the package"
 msgstr "paket tarafýndan tetiklenen paketleri sorgular"
 
-#: lib/poptQV.c:121
+#: lib/poptQV.c:135
 msgid "rpm verify mode"
 msgstr "rpm denetleme kipi"
 
-#: lib/poptQV.c:123
+#: lib/poptQV.c:137
 msgid "query/verify the package(s) which require a dependency"
 msgstr "bir bađýmlýlýk gerektiren paketleri sorgular/denetler"
 
-#: lib/poptQV.c:125
+#: lib/poptQV.c:139
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "bir bađýmlýlýđý sađlayan  paketleri sorgular/denetler"
 
-#: lib/poptQV.c:230
+#: lib/poptQV.c:142
+msgid "create transaction set"
+msgstr ""
+
+#: lib/poptQV.c:144
+msgid "do not order transaction set"
+msgstr ""
+
+#: lib/poptQV.c:146
+#, fuzzy
+msgid "do not glob arguments"
+msgstr "sorgulama için hiç argüman belirtilmedi"
+
+#: lib/poptQV.c:148
+msgid "do not process non-package files as manifests"
+msgstr ""
+
+#: lib/poptQV.c:150
+#, fuzzy
+msgid "do not read headers"
+msgstr "%s: 0x%x de baţlýk okunamadý\n"
+
+#: lib/poptQV.c:257
 msgid "list all configuration files"
 msgstr "tüm yapýlandýrma dosyalarýný listeler"
 
-#: lib/poptQV.c:232
+#: lib/poptQV.c:259
 msgid "list all documentation files"
 msgstr "tüm belgeleme dosyalarýný gösterir"
 
-#: lib/poptQV.c:234
+#: lib/poptQV.c:261
 msgid "dump basic file information"
 msgstr "temel dosya bilgilerini gösterir"
 
-#: lib/poptQV.c:238
+#: lib/poptQV.c:265
 msgid "list files in package"
 msgstr "paketteki dosyalarý gösterir"
 
-#: lib/poptQV.c:243
+#: lib/poptQV.c:270
 #, c-format
 msgid "skip %%ghost files"
 msgstr "%%ghost dosyalarý atlanýr"
 
-#: lib/poptQV.c:247
+#: lib/poptQV.c:274
 #, c-format
 msgid "skip %%license files"
 msgstr "%%license dosyalarý atlanýr"
 
-#: lib/poptQV.c:250
+#: lib/poptQV.c:277
 #, c-format
 msgid "skip %%readme files"
 msgstr "%%readme dosyalarý atlanýr"
 
-#: lib/poptQV.c:256
+#: lib/poptQV.c:283
 msgid "use the following query format"
 msgstr "izleyen sorgulama biçimini kullanýr"
 
-#: lib/poptQV.c:258
+#: lib/poptQV.c:285
 msgid "substitute i18n sections into spec file"
 msgstr "spec dosyasýndaki i18n bölümleri yerine kullanýlýr"
 
-#: lib/poptQV.c:260
+#: lib/poptQV.c:287
 msgid "display the states of the listed files"
 msgstr "listelenmiţ dosyalarýn durumunu gösterir"
 
-#: lib/poptQV.c:286
+#: lib/poptQV.c:313
 msgid "don't verify size of files"
 msgstr "dosyalarýn uzunluklarý dođrulanmaz"
 
-#: lib/poptQV.c:289
+#: lib/poptQV.c:316
 msgid "don't verify symlink path of files"
 msgstr "dosyalarýn sembolik bađ dosya yollarý dođrulanmaz"
 
-#: lib/poptQV.c:292
+#: lib/poptQV.c:319
 msgid "don't verify owner of files"
 msgstr "dosyalarýn sahipleri dođrulanmaz"
 
-#: lib/poptQV.c:295
+#: lib/poptQV.c:322
 msgid "don't verify group of files"
 msgstr "dosyalarýn gruplarý dođrulanmaz"
 
-#: lib/poptQV.c:298
+#: lib/poptQV.c:325
 msgid "don't verify modification time of files"
 msgstr "dosyalarýn deđiţiklik zamanlarý dođrulanmaz"
 
-#: lib/poptQV.c:301 lib/poptQV.c:304
+#: lib/poptQV.c:328 lib/poptQV.c:331
 msgid "don't verify mode of files"
 msgstr "dosyalarýn kipleri dođrulanmaz"
 
-#: lib/poptQV.c:307
+#: lib/poptQV.c:334
 #, fuzzy
 msgid "don't verify file security contexts"
 msgstr "paketteki dosyalar dođrulanamaz"
 
-#: lib/poptQV.c:309
+#: lib/poptQV.c:336
 msgid "don't verify files in package"
 msgstr "paketteki dosyalar dođrulanamaz"
 
-#: lib/poptQV.c:312 lib/poptQV.c:315 tools/rpmgraph.c:267
+#: lib/poptQV.c:339 lib/poptQV.c:342 tools/rpmgraph.c:267
 msgid "don't verify package dependencies"
 msgstr "paket bađýmlýlýklarý dođrulanmaz"
 
-#: lib/poptQV.c:320 lib/poptQV.c:324 lib/poptQV.c:327 lib/poptQV.c:330
+#: lib/poptQV.c:347 lib/poptQV.c:351 lib/poptQV.c:354 lib/poptQV.c:357
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "(varsa) %verifyscript çalýţtýrýlmaz"
 
-#: lib/poptQV.c:354
+#: lib/poptQV.c:381
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "Baţlýk SHA1 özümlemesi dođrulanmaz"
 
-#: lib/poptQV.c:357
+#: lib/poptQV.c:384
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "dosyalarýn MD5 özümlemesi dođrulanmaz"
 
-#: lib/poptQV.c:372
+#: lib/poptQV.c:399
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
 
-#: lib/poptQV.c:374
+#: lib/poptQV.c:401
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "paket imzasýný denetler"
 
-#: lib/poptQV.c:376
+#: lib/poptQV.c:403
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:378
+#: lib/poptQV.c:405
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
 
-#: lib/poptQV.c:380
+#: lib/poptQV.c:407
 msgid "generate signature"
 msgstr "imza üretir"
 
-#: lib/psm.c:268
+#: lib/psm.c:281
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken çalýţtýrýlabilir paketi bulundu\n"
 
-#: lib/psm.c:386
+#: lib/psm.c:399
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyasý içermiyor\n"
 
-#: lib/psm.c:472
+#: lib/psm.c:485
 #, c-format
 msgid "%s: waitpid(%d) rc %d status %x secs %u.%03u\n"
 msgstr ""
 
-#: lib/psm.c:541
+#: lib/psm.c:554
 #, c-format
 msgid "setexeccon(%s) fails from context \"%s\": %s\n"
 msgstr ""
 
-#: lib/psm.c:545
+#: lib/psm.c:558
 #, c-format
 msgid ""
 "setexeccon(%s) fails from context \"%s\": %s\n"
 "Continuing ...\n"
 msgstr ""
 
-#: lib/psm.c:631
+#: lib/psm.c:714
+#, fuzzy, c-format
+msgid "%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"
+msgstr "%s: %s betiđi çalýţtýrýlýyor (varsa)\n"
+
+#: lib/psm.c:736
 #, c-format
-msgid "%s: %s(%s-%s-%s) skipping redundant \"%s\".\n"
+msgid "%s: %s(%s-%s-%s.%s) skipping redundant \"%s\".\n"
 msgstr ""
 
-#: lib/psm.c:639
+#: lib/psm.c:744
 #, c-format
-msgid "%s: %s(%s-%s-%s) %ssynchronous scriptlet start\n"
+msgid "%s: %s(%s-%s-%s.%s) %ssynchronous scriptlet start\n"
 msgstr ""
 
-#: lib/psm.c:818
+#: lib/psm.c:956
 #, c-format
-msgid "%s: %s(%s-%s-%s)\texecv(%s) pid %d\n"
+msgid "%s: %s(%s-%s-%s.%s)\texecv(%s) pid %d\n"
 msgstr ""
 
-#: lib/psm.c:851
+#: lib/psm.c:990
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
+msgid "%s(%s-%s-%s.%s) scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: %s betiđi baţarýsýz (%d), %s-%s-%s atlanýyor\n"
 
-#: lib/psm.c:857
+#: lib/psm.c:996
 #, fuzzy, c-format
-msgid "%s(%s-%s-%s) scriptlet failed, exit status %d\n"
+msgid "%s(%s-%s-%s.%s) scriptlet 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:1288
+#: lib/psm.c:1429
 #, 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:1423
+#: lib/psm.c:1606
 #, 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:1532
+#: lib/psm.c:1715
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "%s'den baţlýk okunamadý: %s\n"
 
-#: lib/psm.c:1610
+#: lib/psm.c:1793
 #, 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:1611
+#: lib/psm.c:1794
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:1797
+#: lib/psm.c:1980
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/psm.c:1800
+#: lib/psm.c:1983
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s baţarýsýz\n"
 
-#: lib/query.c:118 lib/rpmts.c:575
+#: lib/psm.c:2168
+#, c-format
+msgid "Attempting to mark %s as installed in score board(%u).\n"
+msgstr ""
+
+#: lib/psm.c:2201
+#, c-format
+msgid "Attempting to mark %s as erased in score board(0x%x).\n"
+msgstr ""
+
+#: lib/query.c:123 lib/rpmts.c:598
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "biçem yanlýţ: %s\n"
 
 #. @-boundswrite@
-#: lib/query.c:165
+#: lib/query.c:170
 msgid "(contains no files)"
 msgstr "(hiç dosya içermiyor)"
 
-#: lib/query.c:230
+#: lib/query.c:235
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:233
+#: lib/query.c:238
 msgid "replaced      "
 msgstr "yerine        "
 
-#: lib/query.c:236
+#: lib/query.c:241
 msgid "not installed "
 msgstr "yüklenmedi "
 
-#: lib/query.c:239
+#: lib/query.c:244
 msgid "net shared    "
 msgstr "ađ paylaţýmlý "
 
-#: lib/query.c:242
+#: lib/query.c:247
 msgid "wrong color   "
 msgstr ""
 
-#: lib/query.c:245
+#: lib/query.c:250
 msgid "(no state)    "
 msgstr "(durumsuz)    "
 
-#: lib/query.c:248
+#: lib/query.c:253
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(bilinmeyen %3d)"
 
-#: lib/query.c:266
+#: lib/query.c:271
 #, fuzzy
 msgid "package has not file owner/group lists\n"
 msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
 
-#: lib/query.c:299
+#: lib/query.c:304
 msgid "package has neither file owner or id lists\n"
 msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
 
-#: lib/query.c:428 lib/query.c:475 lib/rpminstall.c:123 lib/rpminstall.c:476
-#: lib/rpminstall.c:607 lib/rpminstall.c:1032 lib/rpmts.c:586
-#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
-#, c-format
-msgid "open of %s failed: %s\n"
-msgstr "%s açýlamadý: %s\n"
-
-#: lib/query.c:443
-#, c-format
-msgid "query of %s failed\n"
-msgstr "%s 'nin sorgulamasý baţarýsýzlýkla sonuçlandý\n"
-
-#: lib/query.c:453
-msgid "old format source packages cannot be queried\n"
-msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
-
-#: lib/query.c:488 lib/rpminstall.c:622
-#, fuzzy, c-format
-msgid "%s: not an rpm package (or package manifest): %s\n"
-msgstr "%s tetikleyen paket yok\n"
-
-#: lib/query.c:517
-msgid "no packages\n"
-msgstr "paket yok\n"
-
-#: lib/query.c:535
-#, fuzzy, c-format
-msgid "unknown tag: \"%s\"\n"
-msgstr "bilinmeyen etiket"
-
-#: lib/query.c:561
+#: lib/query.c:460
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/query.c:570
+#: lib/query.c:469
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:583 lib/query.c:604 lib/query.c:624 lib/query.c:658
+#: lib/query.c:482 lib/query.c:503 lib/query.c:523 lib/query.c:557
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s okunamadý: %s.\n"
 
-#: lib/query.c:593 lib/query.c:610 lib/query.c:634 lib/query.c:663
+#: lib/query.c:492 lib/query.c:509 lib/query.c:533 lib/query.c:562
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:673
+#: lib/query.c:572
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s gerektiren paket yok\n"
 
-#: lib/query.c:684
+#: lib/query.c:583
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s sađlayan paket yok\n"
 
-#: lib/query.c:719
+#: lib/query.c:622
 #, c-format
 msgid "file %s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: lib/query.c:723
+#: lib/query.c:626
 #, 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:748
+#: lib/query.c:651
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "geçersiz paket numarasý: %s\n"
 
-#: lib/query.c:751
+#: lib/query.c:654
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paket kayýt numarasý: %u\n"
 
-#: lib/query.c:756
+#: lib/query.c:659
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "%u. kayýt okunamadý\n"
 
-#: lib/query.c:766 lib/rpminstall.c:792
+#: lib/query.c:669 lib/rpminstall.c:793
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu deđil\n"
 
-#: lib/rpmal.c:694
+#: lib/rpmal.c:777
 #, fuzzy
 msgid "(added files)"
 msgstr "db dosyasý %s hatalý\n"
 
-#: lib/rpmal.c:772
+#: lib/rpmal.c:855
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s EVET (önlem eklendi)\n"
@@ -2570,15 +2672,15 @@ msgstr ")"
 msgid "OK"
 msgstr "Tamam"
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/rpmds.c:540 lib/rpmds.c:905
+#: lib/rpmds.c:738 lib/rpmds.c:1102
 msgid "YES"
 msgstr "EVET"
 
-#: lib/rpmds.c:870
+#: lib/rpmds.c:1068
 #, fuzzy, c-format
 msgid ""
 "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
@@ -2587,13 +2689,13 @@ msgstr ""
 "\"B\" bađýmlýlýđý bir dönemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:904
+#: lib/rpmds.c:1101
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:928
+#: lib/rpmds.c:1125
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n"
@@ -2603,158 +2705,187 @@ msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n"
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok flamasýndan dolayý %s atlandý\n"
 
-#: lib/rpmfi.c:799
+#: lib/rpmfi.c:801
 msgid "========== relocations\n"
 msgstr "========== yeniden konumlama\n"
 
-#: lib/rpmfi.c:803
+#: lib/rpmfi.c:805
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d %s'i dýţlýyor\n"
 
-#: lib/rpmfi.c:806
+#: lib/rpmfi.c:808
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n"
 
-#: lib/rpmfi.c:934
+#: lib/rpmfi.c:942
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s dýţlanýyor\n"
 
-#: lib/rpmfi.c:944
+#: lib/rpmfi.c:952
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s %s'e konumlanýyor\n"
 
-#: lib/rpmfi.c:1036
+#: lib/rpmfi.c:1044
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizini %s de yeniden konumlanýyor\n"
 
-#: lib/rpminstall.c:190
+#: lib/rpmgi.c:81 lib/rpminstall.c:124 lib/rpminstall.c:477
+#: lib/rpminstall.c:608 lib/rpminstall.c:1036 lib/rpmts.c:609
+#: tools/rpmgraph.c:120 tools/rpmgraph.c:157
+#, c-format
+msgid "open of %s failed: %s\n"
+msgstr "%s açýlamadý: %s\n"
+
+#: lib/rpmgi.c:355
+#, fuzzy, c-format
+msgid "unknown tag: \"%s\"\n"
+msgstr "bilinmeyen etiket"
+
+#. XXX rpminstall will need RPMMESS_ERROR
+#: lib/rpmgi.c:625 lib/rpminstall.c:652 lib/rpminstall.c:827
+#: lib/rpminstall.c:1262 lib/transaction.c:1019 tools/rpmgraph.c:195
+#, fuzzy
+msgid "Failed dependencies:\n"
+msgstr "bađýmlýlýklarda hata; gerekli paketler:\n"
+
+#: lib/rpmgi.c:631 lib/rpminstall.c:659 tools/rpmgraph.c:201
+msgid "    Suggested resolutions:\n"
+msgstr ""
+
+#: lib/rpminstall.c:191
 msgid "Preparing..."
 msgstr "Hazýrlanýyor..."
 
-#: lib/rpminstall.c:192
+#: lib/rpminstall.c:193
 msgid "Preparing packages for installation..."
 msgstr "Kurulacak paketler hazýrlanýyor..."
 
-#: lib/rpminstall.c:210
+#: lib/rpminstall.c:211
 #, fuzzy
 msgid "Repackaging..."
 msgstr "Hazýrlanýyor..."
 
-#: lib/rpminstall.c:212
+#: lib/rpminstall.c:213
 msgid "Repackaging erased files..."
 msgstr ""
 
-#: lib/rpminstall.c:231
+#: lib/rpminstall.c:232
 #, fuzzy
 msgid "Upgrading..."
 msgstr "Hazýrlanýyor..."
 
-#: lib/rpminstall.c:233
+#: lib/rpminstall.c:234
 #, fuzzy
 msgid "Upgrading packages..."
 msgstr "paket günceller"
 
-#: lib/rpminstall.c:408
+#: lib/rpminstall.c:409
 #, fuzzy, c-format
 msgid "Adding goal: %s\n"
 msgstr "%s aranýyor: (%s kullanarak)...\n"
 
-#: lib/rpminstall.c:423
+#: lib/rpminstall.c:424
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s alýnýyor\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:436
+#: lib/rpminstall.c:437
 #, c-format
 msgid " ... as %s\n"
 msgstr "... %s olarak\n"
 
-#: lib/rpminstall.c:440
+#: lib/rpminstall.c:441
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s atlanýyor - aktarým baţarýsýz - %s\n"
 
-#: lib/rpminstall.c:495 lib/rpminstall.c:886 tools/rpmgraph.c:140
+#: lib/rpminstall.c:496 lib/rpminstall.c:890 tools/rpmgraph.c:140
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s yüklenemedi\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:513
 #, fuzzy, c-format
 msgid "\tadded source package [%d]\n"
 msgstr "<kaynak paketi>"
 
-#: lib/rpminstall.c:537
+#: lib/rpminstall.c:538
 #, fuzzy, c-format
 msgid "package %s is not relocatable\n"
 msgstr "%s paketi yeniden konumlandýrýlamaz\n"
 
-#: lib/rpminstall.c:582
+#: lib/rpminstall.c:583
 #, fuzzy, c-format
 msgid "\tadded binary package [%d]\n"
 msgstr "icra edilebilir paketleri kuruluyor\n"
 
-#: lib/rpminstall.c:587
+#: lib/rpminstall.c:588
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s dosyasýndan okuma hatalý\n"
 
-#: lib/rpminstall.c:593
+#: lib/rpminstall.c:594
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "%s dosyasý RPM'nin daha yeni bir sürümünü gerektiriyor\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:623
+#, fuzzy, c-format
+msgid "%s: not an rpm package (or package manifest): %s\n"
+msgstr "%s tetikleyen paket yok\n"
+
+#: lib/rpminstall.c:638
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
 
-#: lib/rpminstall.c:651 lib/rpminstall.c:824 lib/rpminstall.c:1253
-#: tools/rpmgraph.c:195
-#, fuzzy
-msgid "Failed dependencies:\n"
-msgstr "bađýmlýlýklarda hata; gerekli paketler:\n"
-
-#: lib/rpminstall.c:658 tools/rpmgraph.c:201
-msgid "    Suggested resolutions:\n"
-msgstr ""
-
-#: lib/rpminstall.c:688
+#: lib/rpminstall.c:689
 msgid "installing binary packages\n"
 msgstr "icra edilebilir paketleri kuruluyor\n"
 
-#: lib/rpminstall.c:712
+#: lib/rpminstall.c:713
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s dosyasý açýlamadý: %s\n"
 
-#: lib/rpminstall.c:801
+#: lib/rpminstall.c:802
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
 
-#: lib/rpminstall.c:870
+#: lib/rpminstall.c:874
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/rpminstall.c:876
+#: lib/rpminstall.c:880
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s kuruluyor\n"
 
-#: lib/rpminstall.c:1247
+#: lib/rpminstall.c:1256 lib/transaction.c:1012
 #, c-format
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
+#: lib/rpminstall.c:1287 lib/transaction.c:1063
+msgid "Cleaning up repackaged packages:\n"
+msgstr ""
+
+#. @innercontinue@
+#. XXX can't happen
+#: lib/rpminstall.c:1294 lib/transaction.c:1069
+#, fuzzy, c-format
+msgid "\tRemoving %s:\n"
+msgstr "%s alýnýyor\n"
+
 #: lib/rpmlead.c:56
 #, c-format
 msgid "read failed: %s (%d)\n"
@@ -2769,7 +2900,7 @@ msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
 msgstr ""
 
 #: lib/rpmlibprov.c:35
-msgid "package payload is compressed using bzip2."
+msgid "package payload can be compressed using bzip2."
 msgstr ""
 
 #: lib/rpmlibprov.c:38
@@ -2796,6 +2927,11 @@ msgstr ""
 msgid "package scriptlets may access the rpm database while installing."
 msgstr ""
 
+#: lib/rpmlibprov.c:56
+#, fuzzy
+msgid "internal support for lua scripts."
+msgstr "- dizgelerde desteklenmez\n"
+
 #. @observer@
 #: lib/rpmps.c:200
 msgid "different"
@@ -2871,175 +3007,230 @@ msgstr " %s-%s-%s ile çeliţiyor\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "anlaţýlamayan %d hatasý, %s paketi iţlenirken saptandý"
 
-#: lib/rpmrc.c:197
+#: lib/rpmrc.c:198
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr "%s:%d - ikinci ':' eksik\n"
 
-#: lib/rpmrc.c:200
+#: lib/rpmrc.c:201
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr "%s:%d - mimari ismi eksik\n"
 
-#: lib/rpmrc.c:354
+#: lib/rpmrc.c:355
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr "%s:%d - veri satýrý tamamlanmamýţ\n"
 
-#: lib/rpmrc.c:359
+#: lib/rpmrc.c:360
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr "%s:%d - veri satýrýnda çok fazla argüman\n"
 
-#: lib/rpmrc.c:367
+#: lib/rpmrc.c:368
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr "arch/os numarasý hatalý: %s (%s:%d)\n"
 
-#: lib/rpmrc.c:404
+#: lib/rpmrc.c:405
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr "%s:%d - öntanýmlý satýr tamamlanmamýţ\n"
 
-#: lib/rpmrc.c:409
+#: lib/rpmrc.c:410
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr "%s:%d - öntanýmlý satýrda çok fazla argüman\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr "%s okunamadý: %s.\n"
 
-#: lib/rpmrc.c:613
+#: lib/rpmrc.c:614
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr "(0x%02x bulundu) %s:%d de ':' yok\n"
 
-#: lib/rpmrc.c:630 lib/rpmrc.c:704
+#: lib/rpmrc.c:631 lib/rpmrc.c:705
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr "%s için %s:%d de argüman eksik\n"
 
-#: lib/rpmrc.c:647 lib/rpmrc.c:669
+#: lib/rpmrc.c:648 lib/rpmrc.c:670
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr "%s geniţletmesi %s:%d \"%s\" de baţarýsýz \n"
 
-#: lib/rpmrc.c:656
+#: lib/rpmrc.c:657
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr "%s dosyasý açýlamýyor (%s:%d): %s\n"
 
-#: lib/rpmrc.c:696
+#: lib/rpmrc.c:697
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr "%s için %s:%d'de eksik mimari\n"
 
-#: lib/rpmrc.c:763
+#: lib/rpmrc.c:764
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr "seçenek '%s' (%s:%d) de hatalý\n"
 
-#: lib/rpmrc.c:1527
+#: lib/rpmrc.c:1568
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Bilinmeyen sistem: %s\n"
 
-#: lib/rpmrc.c:1528
+#: lib/rpmrc.c:1569
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Lütfen rpm-list@redhat.com listesine üye olun\n"
 
-#: lib/rpmrc.c:1765
+#: lib/rpmrc.c:1806
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr "%s geniţletilemiyor\n"
 
-#: lib/rpmrc.c:1770
+#: lib/rpmrc.c:1811
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr "%s okunamýyor, EV çok büyük\n"
 
-#: lib/rpmrc.c:1787
+#: lib/rpmrc.c:1828
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s okuma eriţimi için açýlamadý: %s.\n"
 
-#: lib/rpmsx.c:358
+#: lib/rpmsx.c:369
 #, c-format
 msgid "%s:  no newline on line number %d (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:375
+#: lib/rpmsx.c:386
 #, c-format
 msgid "%s:  line number %d is missing fields (only read %s)\n"
 msgstr ""
 
-#: lib/rpmsx.c:406
+#: lib/rpmsx.c:419
 #, c-format
 msgid "%s:  unable to compile regular expression %s on line number %d:  %s\n"
 msgstr ""
 
-#: lib/rpmsx.c:421 lib/rpmsx.c:436
+#: lib/rpmsx.c:434 lib/rpmsx.c:449
 #, c-format
 msgid "%s:  invalid type specifier %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmsx.c:449
+#: lib/rpmsx.c:462
 #, c-format
 msgid "%s:  invalid context %s on line number %d\n"
 msgstr ""
 
-#: lib/rpmts.c:164
+#: lib/rpmts.c:187
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s de Paket veritabaný açýlamadý\n"
 
-#: lib/rpmts.c:262
+#: lib/rpmts.c:285
 #, fuzzy, c-format
 msgid "extra '(' in package label: %s\n"
 msgstr "geçersiz paket numarasý: %s\n"
 
-#: lib/rpmts.c:280
+#: lib/rpmts.c:303
 #, fuzzy, c-format
 msgid "missing '(' in package label: %s\n"
 msgstr "%s içinde '(' yok: %s\n"
 
-#: lib/rpmts.c:288
+#: lib/rpmts.c:311
 #, fuzzy, c-format
 msgid "missing ')' in package label: %s\n"
 msgstr "geçersiz paket numarasý: %s\n"
 
-#: lib/rpmts.c:465
+#: lib/rpmts.c:488
 #, fuzzy, c-format
 msgid "cannot open Solve database in %s\n"
 msgstr "%s dizininde rpm veritabaný açýlamýyor\n"
 
-#: lib/rpmts.c:607
+#: lib/rpmts.c:630
 #, fuzzy, c-format
 msgid "Adding: %s\n"
 msgstr "satýr: %s\n"
 
-#: lib/rpmts.c:619
+#: lib/rpmts.c:642
 #, fuzzy, c-format
 msgid "Suggesting: %s\n"
 msgstr "%s alýnýyor\n"
 
-#: lib/rpmts.c:1107
+#: lib/rpmts.c:1165
 #, fuzzy
 msgid "mounted filesystems:\n"
 msgstr "bađlý dosya sistemlerinin listesi alýnýyor\n"
 
-#: lib/rpmts.c:1109
+#: lib/rpmts.c:1167
 msgid "    i    dev bsize       bavail       iavail mount point\n"
 msgstr ""
 
-#: lib/rpmts.c:1165
+#: lib/rpmts.c:1223
 #, c-format
 msgid "%5d 0x%04x %5u %12ld %12ld %s\n"
 msgstr ""
 
+#: lib/rpmts.c:1558
+#, c-format
+msgid "Creating transaction score board(%p, %p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1563
+#, c-format
+msgid "\tScore board address:  %p\n"
+msgstr ""
+
+#: lib/rpmts.c:1573
+#, fuzzy, c-format
+msgid "\tAllocating space for %d entries\n"
+msgstr "%s %s'e konumlanýyor\n"
+
+#. @-compdef -usereleased@
+#. XXX p->fi->te undefined.
+#: lib/rpmts.c:1600
+#, c-format
+msgid "\tAdding entry for %s to score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1604
+#, c-format
+msgid "\t\tEntry address:  %p\n"
+msgstr ""
+
+#. We found this one, so just add the element type to the one
+#. * already there.
+#.
+#: lib/rpmts.c:1615
+#, c-format
+msgid "\tUpdating entry for %s in score board.\n"
+msgstr ""
+
+#: lib/rpmts.c:1640
+#, c-format
+msgid "May free Score board(%p)\n"
+msgstr ""
+
+#: lib/rpmts.c:1655
+msgid "\tRefcount is zero...will free\n"
+msgstr ""
+
+#. Assume we don't find it
+#: lib/rpmts.c:1705
+#, c-format
+msgid "Looking in score board(%p) for %s\n"
+msgstr ""
+
+#: lib/rpmts.c:1711
+#, c-format
+msgid "\tFound entry at address:  %p\n"
+msgstr ""
+
 #: lib/signature.c:133
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
@@ -3056,6 +3247,7 @@ msgid "sigh size(%d): BAD, read returned %d\n"
 msgstr ""
 
 #: lib/signature.c:186
+#, c-format
 msgid "sigh magic: BAD\n"
 msgstr ""
 
@@ -3080,6 +3272,7 @@ msgid "sigh tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
 #: lib/signature.c:300
+#, c-format
 msgid "sigh load: BAD\n"
 msgstr ""
 
@@ -3147,6 +3340,9 @@ msgstr "GPG imzasýnýn %d baytý alýndý\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
 #: lib/signature.c:879 lib/signature.c:934
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
@@ -3171,44 +3367,167 @@ msgstr "Baţlýk çok uzun"
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:1075
+#: lib/signature.c:1076
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "Baţlýk SHA1 özümlemesi dođrulanmaz"
 
-#: lib/signature.c:1152
+#: lib/signature.c:1153
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "tüm MD5 imzalarýný atlar"
 
-#: lib/signature.c:1273
+#: lib/signature.c:1280
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1281
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ýmza yok\n"
 
-#: lib/signature.c:1357
+#: lib/signature.c:1365
+#, c-format
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1384
+#: lib/signature.c:1392
+#, c-format
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1388
+#: lib/signature.c:1396
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Ýmza: boyut(%d)+iz(%d)\n"
 
 #. @innercontinue@
-#: lib/transaction.c:893
+#: lib/transaction.c:923
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizini dýţlanýyor\n"
 
+#: lib/transaction.c:1010
+msgid "Transaction failed...rolling back\n"
+msgstr ""
+
+#: lib/transaction.c:1030
+msgid "Could not order auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1120
+msgid "Getting repackaged header from transaction element\n"
+msgstr ""
+
+#. Get the index of possible repackaged packages
+#: lib/transaction.c:1145
+#, c-format
+msgid "\tLooking for %s...\n"
+msgstr ""
+
+#: lib/transaction.c:1149
+msgid "\tMatches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1153
+msgid "\tNo matches found.\n"
+msgstr ""
+
+#: lib/transaction.c:1166
+#, fuzzy
+msgid "\tRepackaged package not found!.\n"
+msgstr "kaynak paketi gerekirken çalýţtýrýlabilir paketi bulundu\n"
+
+#. OK, the tid matches.  Now lets see if the name is the same.
+#. * If I could not get the name from the package, I will go onto
+#. * the next one.  Perhaps I should return an error at this
+#. * point, but if this was not the correct one, at least the correct one
+#. * would be found.
+#. * XXX:  Should Match NAC!
+#.
+#: lib/transaction.c:1187
+msgid "\tREMOVETID matched INSTALLTID.\n"
+msgstr ""
+
+#: lib/transaction.c:1189
+#, c-format
+msgid "\t\tName:  %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1212
+#, fuzzy, c-format
+msgid "\tRepackaged Package was %s...\n"
+msgstr "%s tetikleyen paket yok\n"
+
+#: lib/transaction.c:1256
+msgid "Adding install element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1265
+msgid "Could not get install element database instance!\n"
+msgstr ""
+
+#: lib/transaction.c:1278
+msgid "Could not get header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1288
+#, fuzzy, c-format
+msgid "\tAdded repackaged package header: %s.\n"
+msgstr "<kaynak paketi>"
+
+#: lib/transaction.c:1290 lib/transaction.c:1301
+#, c-format
+msgid "\tAdded from install element %s.\n"
+msgstr ""
+
+#. Add the header as an erase element, we did not
+#. * have a repackaged package
+#.
+#: lib/transaction.c:1299
+msgid "\tAdded erase element.\n"
+msgstr ""
+
+#: lib/transaction.c:1308
+msgid "Could not get repackaged header for auto-rollback transaction!\n"
+msgstr ""
+
+#: lib/transaction.c:1315
+msgid "Add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1323
+msgid "\tFound existing upgrade element.\n"
+msgstr ""
+
+#: lib/transaction.c:1324
+#, c-format
+msgid "\tNot adding erase element for %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1341
+#, fuzzy, c-format
+msgid "\tAdded repackaged package %s.\n"
+msgstr "<kaynak paketi>"
+
+#: lib/transaction.c:1343
+#, c-format
+msgid "\tAdded from erase element %s.\n"
+msgstr ""
+
+#: lib/transaction.c:1348
+msgid "Could not add erase element to auto-rollback transaction.\n"
+msgstr ""
+
+#: lib/transaction.c:1354
+msgid "\tNo repackaged package...nothing to do.\n"
+msgstr ""
+
+#: lib/transaction.c:1360
+#, fuzzy
+msgid "Failure reading repackaged package!\n"
+msgstr "paketten baţlýk okunmasý sýrasýnda hata oluţtu\n"
+
 #. ===============================================
 #. * For packages being installed:
 #. * - verify package arch/os.
@@ -3217,11 +3536,15 @@ msgstr "%s dizini dýţlanýyor\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1013
+#: lib/transaction.c:1483
 #, c-format
 msgid "sanity checking %d elements\n"
 msgstr ""
 
+#: lib/transaction.c:1569
+msgid "running pre-transaction scripts\n"
+msgstr ""
+
 #. ===============================================
 #. * Initialize transaction element file info for package:
 #.
@@ -3230,7 +3553,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1639
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3238,13 +3561,37 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1182
+#: lib/transaction.c:1720
 msgid "computing file dispositions\n"
 msgstr ""
 
+#: lib/transaction.c:1897
+msgid "Creating auto-rollback transaction\n"
+msgstr ""
+
+#: lib/transaction.c:2051
+msgid "Add failed.  Could not read package header.\n"
+msgstr ""
+
+#: lib/transaction.c:2115
+msgid "Add failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2159
+msgid "Add failed.  Could not get file list.\n"
+msgstr ""
+
+#: lib/transaction.c:2208
+msgid "Erase failed failed in rpmpsmStage().\n"
+msgstr ""
+
+#: lib/transaction.c:2266
+msgid "running post-transaction scripts\n"
+msgstr ""
+
 #: lib/verify.c:321
 #, fuzzy, c-format
-msgid "missing  %c %s"
+msgid "missing   %c %s"
 msgstr "eksik      %s"
 
 #: lib/verify.c:437
@@ -3277,135 +3624,135 @@ msgstr "silindi       db ortamý %s/%s\n"
 msgid "opening  db environment %s/%s %s\n"
 msgstr "açýlýyor      db ortamý %s/%s %s\n"
 
-#: rpmdb/db3.c:782
+#: rpmdb/db3.c:792
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr "kapandý      db endeks %s/%s\n"
 
-#: rpmdb/db3.c:849
+#: rpmdb/db3.c:861
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr "dođrulandý    db endeks %s/%s\n"
 
-#: rpmdb/db3.c:989
+#: rpmdb/db3.c:1001
 #, c-format
 msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1093
+#: rpmdb/db3.c:1105
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "açýlýyor       db endeks %s/%s %s kip=0x%x\n"
 
-#: rpmdb/db3.c:1331
+#: rpmdb/db3.c:1343
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%s kilit  %s/%s'den alýnamadý\n"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "exclusive"
 msgstr "bađdaţýk"
 
-#: rpmdb/db3.c:1333
+#: rpmdb/db3.c:1345
 msgid "shared"
 msgstr "paylaţýmlý"
 
-#: rpmdb/db3.c:1337
+#: rpmdb/db3.c:1349
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "kilitli      db endeks %s/%s\n"
 
-#: rpmdb/dbconfig.c:337
+#: rpmdb/dbconfig.c:339
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr "tanýnmayan db seçeneđi: \"%s\" yoksayýldý\n"
 
-#: rpmdb/dbconfig.c:377
+#: rpmdb/dbconfig.c:379
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s geçersiz sayýsal deđer içeriyor, atlandý\n"
 
-#: rpmdb/dbconfig.c:386
+#: rpmdb/dbconfig.c:388
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s ya çok büyük ya da çok küçük 'long' deđer içeriyor, atlandý\n"
 
-#: rpmdb/dbconfig.c:395
+#: rpmdb/dbconfig.c:397
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s ya çok büyük ya da çok küçük 'integer' deđer içeriyor, atlandý\n"
 
-#: rpmdb/header.c:2686
+#: rpmdb/header.c:2719
 msgid "missing { after %"
 msgstr "%% den sonraki { yok"
 
-#: rpmdb/header.c:2716
+#: rpmdb/header.c:2749
 msgid "missing } after %{"
 msgstr "%%{ den sonraki } yok"
 
-#: rpmdb/header.c:2732
+#: rpmdb/header.c:2765
 msgid "empty tag format"
 msgstr "etiket biçemi boţ"
 
-#: rpmdb/header.c:2744
+#: rpmdb/header.c:2777
 msgid "empty tag name"
 msgstr "etiket ismi boţ"
 
-#: rpmdb/header.c:2753
+#: rpmdb/header.c:2786
 msgid "unknown tag"
 msgstr "bilinmeyen etiket"
 
-#: rpmdb/header.c:2780
+#: rpmdb/header.c:2813
 msgid "] expected at end of array"
 msgstr "dizinin sonunda ] gerekli"
 
-#: rpmdb/header.c:2793
+#: rpmdb/header.c:2826
 msgid "unexpected ]"
 msgstr "beklenmeyen ]"
 
-#: rpmdb/header.c:2806
+#: rpmdb/header.c:2839
 msgid "unexpected }"
 msgstr "beklenmeyen }"
 
-#: rpmdb/header.c:2870
+#: rpmdb/header.c:2903
 msgid "? expected in expression"
 msgstr "ifade içerisinde ? gerekli"
 
-#: rpmdb/header.c:2877
+#: rpmdb/header.c:2910
 msgid "{ expected after ? in expression"
 msgstr "ifade içerisinde ? dan sonra { gerekli"
 
-#: rpmdb/header.c:2889 rpmdb/header.c:2929
+#: rpmdb/header.c:2922 rpmdb/header.c:2962
 msgid "} expected in expression"
 msgstr "ifade içinde } gerekli"
 
-#: rpmdb/header.c:2897
+#: rpmdb/header.c:2930
 msgid ": expected following ? subexpression"
 msgstr "? alt ifadesinden sonra : gerekli"
 
-#: rpmdb/header.c:2915
+#: rpmdb/header.c:2948
 msgid "{ expected after : in expression"
 msgstr "ifade içersinde : den sonra { gerekli"
 
-#: rpmdb/header.c:2937
+#: rpmdb/header.c:2970
 msgid "| expected at end of expression"
 msgstr "ifadenin sonunda | gerekli"
 
 #. @=modobserver =observertrans@
-#: rpmdb/header.c:3038
+#: rpmdb/header.c:3071
 msgid "(index out of range)"
 msgstr ""
 
-#: rpmdb/header.c:3285
+#: rpmdb/header.c:3318
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: rpmdb/header.c:3601
+#: rpmdb/header.c:3637
 #, c-format
 msgid "%c"
 msgstr ""
 
-#: rpmdb/header.c:3617
+#: rpmdb/header.c:3653
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -3430,327 +3777,327 @@ msgstr "veritabaný dosyaralýný dođrular"
 msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "(eski) rpm[23] paketleme ile uyumlu baţlýklarý üretir"
 
-#: rpmdb/rpmdb.c:213
+#: rpmdb/rpmdb.c:219
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: tanýmlanmamýţ etiket adý: \"%s\" yoksayýldý\n"
 
-#: rpmdb/rpmdb.c:282
+#: rpmdb/rpmdb.c:288
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "%s indeksi db%d - %s (%d) kullanarak açýlamadý\n"
 
-#: rpmdb/rpmdb.c:302
+#: rpmdb/rpmdb.c:308
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "%s indeksi açýlamadý\n"
 
-#: rpmdb/rpmdb.c:917
+#: rpmdb/rpmdb.c:925
 msgid "no dbpath has been set\n"
 msgstr "belirtilmiţ bir dbpath deđeri yok\n"
 
-#: rpmdb/rpmdb.c:1195 rpmdb/rpmdb.c:1324 rpmdb/rpmdb.c:1375 rpmdb/rpmdb.c:2322
-#: rpmdb/rpmdb.c:2438 rpmdb/rpmdb.c:3167
+#: rpmdb/rpmdb.c:1203 rpmdb/rpmdb.c:1332 rpmdb/rpmdb.c:1383 rpmdb/rpmdb.c:2343
+#: rpmdb/rpmdb.c:2463 rpmdb/rpmdb.c:3238
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
 
-#: rpmdb/rpmdb.c:1569
+#: rpmdb/rpmdb.c:1577
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1579
+#: rpmdb/rpmdb.c:1587
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
 
-#: rpmdb/rpmdb.c:2212
+#: rpmdb/rpmdb.c:2231
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2242
+#: rpmdb/rpmdb.c:2263
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: bozuk baţlýk örneđi #%u alýndý, atlanýyor.\n"
 
-#: rpmdb/rpmdb.c:2526
+#: rpmdb/rpmdb.c:2567
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x de baţlýk okunamadý\n"
 
-#: rpmdb/rpmdb.c:2589
+#: rpmdb/rpmdb.c:2633
 #, fuzzy, c-format
 msgid "error(%d) setting header #%d record for %s removal\n"
 msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
 
-#: rpmdb/rpmdb.c:2704
+#: rpmdb/rpmdb.c:2748
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "\"%s\" %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2708
+#: rpmdb/rpmdb.c:2752
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%d girdi %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2736
+#: rpmdb/rpmdb.c:2780
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "hata(%d): \"%s\" kayýt %s indeksinden alýnýyor\n"
 
-#: rpmdb/rpmdb.c:2757
+#: rpmdb/rpmdb.c:2801
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
 
-#: rpmdb/rpmdb.c:2767
+#: rpmdb/rpmdb.c:2811
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "hata(%d) %s kaydýn %s dosyasýndan silinmesi\n"
 
-#: rpmdb/rpmdb.c:2916
+#: rpmdb/rpmdb.c:2976
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "yeni paket örneđini tutma hatasý(%d)\n"
 
-#: rpmdb/rpmdb.c:2970
+#: rpmdb/rpmdb.c:3041
 #, fuzzy
 msgid "rpmdbAdd: skipping"
 msgstr "rpmdb: bozuk baţlýk örneđi #%u alýndý, atlanýyor.\n"
 
-#: rpmdb/rpmdb.c:3142
+#: rpmdb/rpmdb.c:3213
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "\"%s\" %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:3146
+#: rpmdb/rpmdb.c:3217
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%d girdi %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:3186
+#: rpmdb/rpmdb.c:3257
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "hata(%d): %s kayýt %s içine yazýlýyor\n"
 
-#: rpmdb/rpmdb.c:3587
+#: rpmdb/rpmdb.c:3659
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "baţarýlý db3 yeniden oluţturma ertesinde %s kaldýrýlýyor\n"
 
-#: rpmdb/rpmdb.c:3625
+#: rpmdb/rpmdb.c:3697
 msgid "no dbpath has been set"
 msgstr "belirtilmiţ bir dbpath yok"
 
-#: rpmdb/rpmdb.c:3657
+#: rpmdb/rpmdb.c:3729
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%s veritabaný %s içinde yeniden oluţturuluyor\n"
 
-#: rpmdb/rpmdb.c:3661
+#: rpmdb/rpmdb.c:3733
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "geçici veritabaný %s zaten mevcut\n"
 
-#: rpmdb/rpmdb.c:3667
+#: rpmdb/rpmdb.c:3739
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizini oluţturuluyor\n"
 
-#: rpmdb/rpmdb.c:3669
+#: rpmdb/rpmdb.c:3741
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s dizini oluţturuluyor: %s\n"
 
-#: rpmdb/rpmdb.c:3676
+#: rpmdb/rpmdb.c:3748
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "eski veritabaný dbapi %d ile açýlýyor\n"
 
-#: rpmdb/rpmdb.c:3689
+#: rpmdb/rpmdb.c:3761
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "yeni veritabaný dbapi %d ile açýlýyor\n"
 
-#: rpmdb/rpmdb.c:3718
+#: rpmdb/rpmdb.c:3789
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n"
 
-#: rpmdb/rpmdb.c:3758
+#: rpmdb/rpmdb.c:3829
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kayýt özgün olarak %u e eklenemedi\n"
 
-#: rpmdb/rpmdb.c:3772
+#: rpmdb/rpmdb.c:3843
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "veritabaný yeniden oluţturulamadý: mevcut veritabaný deđiţmeden\n"
 "yerinde býrakýldý\n"
 
-#: rpmdb/rpmdb.c:3780
+#: rpmdb/rpmdb.c:3851
 msgid "failed to replace old database with new database!\n"
 msgstr "eski veritabanýnýn yenisiyle deđiţtirilirmesi baţarýsýz!\n"
 
-#: rpmdb/rpmdb.c:3782
+#: rpmdb/rpmdb.c:3853
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deđiţtiriliyor"
 
-#: rpmdb/rpmdb.c:3792
+#: rpmdb/rpmdb.c:3863
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizini siliniyor\n"
 
-#: rpmdb/rpmdb.c:3794
+#: rpmdb/rpmdb.c:3865
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s dizininin silinmesi baţarýsýz: %s\n"
 
-#: rpmio/macro.c:236
+#: rpmio/macro.c:237
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d etkin %d boţ\n"
 
 #. XXX just in case
-#: rpmio/macro.c:374
+#: rpmio/macro.c:394
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(boţ)"
 
-#: rpmio/macro.c:417
+#: rpmio/macro.c:437
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(boţ)\n"
 
-#: rpmio/macro.c:655
+#: rpmio/macro.c:664 rpmio/macro.c:705
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "%%%s makrosunun gövdesi sonlandýrýlmamýţ\n"
 
-#: rpmio/macro.c:688
+#: rpmio/macro.c:727
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr "%%%s makrosunun ismi kuraldýţý (%%define)\n"
 
-#: rpmio/macro.c:694
+#: rpmio/macro.c:733
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "%%%s makrosunu seçenekleri sonlandýrýlmamýţ\n"
 
-#: rpmio/macro.c:699
+#: rpmio/macro.c:738
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "%%%s makrosu boţ\n"
 
-#: rpmio/macro.c:705
+#: rpmio/macro.c:744
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "%%%s makrosu geniţletmede baţarýsýz\n"
 
-#: rpmio/macro.c:740
+#: rpmio/macro.c:779
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr "%%%s makrosunun ismi kuraldýţý (%%define)\n"
 
-#: rpmio/macro.c:858
+#: rpmio/macro.c:897
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr "%%%s (%s) makrosu %d seviyenin altýnda kullanýlmadý\n"
 
-#: rpmio/macro.c:985
+#: rpmio/macro.c:1024
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "%c seçeneđi %s(%s) de anlaţýlamadý\n"
 
-#: rpmio/macro.c:1185
+#: rpmio/macro.c:1224
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr "Yineleme derinliđi(%d) mümkün miktardan(%d) büyük\n"
 
-#: rpmio/macro.c:1256 rpmio/macro.c:1273
+#: rpmio/macro.c:1295 rpmio/macro.c:1312
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c sonlandýrýlmamýţ: %s\n"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1353
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Bir ayrýţtýrýlamayan makro tarafýndan bir %% izlendi\n"
 
-#: rpmio/macro.c:1443
+#: rpmio/macro.c:1510
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr "%%%.*s makrosu bulunamadý, atlanýyor\n"
 
-#: rpmio/macro.c:1514
+#: rpmio/macro.c:1843
 msgid "Target buffer overflow\n"
 msgstr "Hedef tampon bellek taţtý\n"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1709 rpmio/macro.c:1715
+#: rpmio/macro.c:2049 rpmio/macro.c:2055
 #, c-format
 msgid "File %s: %s\n"
 msgstr "%s dosyasý: %s\n"
 
-#: rpmio/macro.c:1718
+#: rpmio/macro.c:2058
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr "%s dosyasý %u bayttan küçük\n"
 
-#: rpmio/rpmio.c:632
+#: rpmio/rpmio.c:652
 msgid "Success"
 msgstr "Baţarýlý"
 
-#: rpmio/rpmio.c:635
+#: rpmio/rpmio.c:655
 msgid "Bad server response"
 msgstr "Sunucudan kötü yanýt"
 
-#: rpmio/rpmio.c:638
+#: rpmio/rpmio.c:658
 msgid "Server I/O error"
 msgstr "Sunucu G/Ç hatasý"
 
-#: rpmio/rpmio.c:641
+#: rpmio/rpmio.c:661
 msgid "Server timeout"
 msgstr "Sunucu zaman aţýmý"
 
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:664
 msgid "Unable to lookup server host address"
 msgstr "Sunucu makina adresi bulunamadý"
 
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:667
 msgid "Unable to lookup server host name"
 msgstr "Sunucu makina ismi bulunamadý"
 
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:670
 msgid "Failed to connect to server"
 msgstr "Sunucuya bađlanýlamadý"
 
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:673
 msgid "Failed to establish data connection to server"
 msgstr "Sunucuya veri bađlantýsý kurulamadý"
 
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:676
 msgid "I/O error to local file"
 msgstr "Yerel dosyaya G/Ç hatasý"
 
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:679
 msgid "Error setting remote server to passive mode"
 msgstr "Karţý sunucuyu pasif kipe sokma ayarlarýnda hata"
 
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:682
 msgid "File not found on server"
 msgstr "Dosya sunucuda bulunamadý"
 
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:685
 msgid "Abort in progress"
 msgstr "Kesme iţlemi sürüyor"
 
-#: rpmio/rpmio.c:669
+#: rpmio/rpmio.c:689
 msgid "Unknown or unexpected error"
 msgstr "Bilinmeyen ya da beklenmeyen hata"
 
-#: rpmio/rpmio.c:1362
+#: rpmio/rpmio.c:1382
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "%s sunucusuna %s olarak giriliyor, parola %s\n"
@@ -3760,6 +4107,7 @@ msgid "(no error)"
 msgstr "(hata yok)"
 
 #. !< RPMLOG_EMERG
+#. !< RPMLOG_ALERT
 #: rpmio/rpmlog.c:142 rpmio/rpmlog.c:143 rpmio/rpmlog.c:144
 msgid "fatal error: "
 msgstr "ölümcül hata: "
@@ -3779,94 +4127,61 @@ msgstr "uyarý: "
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "bellek ayrýlýrken (%u bayt) NULL döndü.\n"
 
-#: rpmio/url.c:122
+#: rpmio/url.c:118
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "uyarý: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "uyarý: u %p veri %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:171
+#: rpmio/url.c:167
 #, fuzzy, c-format
 msgid "warning: _url_cache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "uyarý: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:267
+#: rpmio/url.c:263
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s için parola: "
 
-#: rpmio/url.c:295 rpmio/url.c:321
+#: rpmio/url.c:291 rpmio/url.c:317
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "hata: %sport bir sayý olmalý\n"
 
-#: rpmio/url.c:476
+#: rpmio/url.c:472
 msgid "url port must be a number\n"
 msgstr "url portu bir sayý olmalý\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:543
+#: rpmio/url.c:539
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s oluţturulamadý: %s\n"
 
-#: tools/rpmcache.c:515 tools/rpmgraph.c:269
+#: tools/rpmcache.c:513 tools/rpmgraph.c:269
 #, fuzzy
 msgid "don't verify header+payload signature"
 msgstr "paket imzasýný denetler"
 
-#: tools/rpmcache.c:518
+#: tools/rpmcache.c:516
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:522
-msgid "follow command line symlinks"
-msgstr ""
-
-#: tools/rpmcache.c:525
-msgid "logical walk"
-msgstr ""
-
-#: tools/rpmcache.c:528
+#: tools/rpmcache.c:519
 #, fuzzy
-msgid "don't change directories"
-msgstr "%s dizini oluţturuluyor\n"
-
-#: tools/rpmcache.c:531
-msgid "don't get stat info"
-msgstr ""
-
-#: tools/rpmcache.c:534
-msgid "physical walk"
-msgstr ""
-
-#: tools/rpmcache.c:537
-msgid "return dot and dot-dot"
-msgstr ""
-
-#: tools/rpmcache.c:540
-msgid "don't cross devices"
-msgstr ""
-
-#: tools/rpmcache.c:543
-msgid "return whiteout information"
-msgstr ""
-
-#: tools/rpmcache.c:546 tools/rpmdeps.c:34 tools/rpmgraph.c:276
-#, fuzzy
-msgid "Common options for all rpm modes and executables:"
-msgstr "Tüm rpm kipleri için ortak seçenekler:"
+msgid "File tree walk options:"
+msgstr "Ýmza seçenekleri:"
 
-#: tools/rpmcache.c:578
+#: tools/rpmcache.c:555
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:618
+#: tools/rpmcache.c:595
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: açýlamadý: %s\n"
@@ -3963,6 +4278,27 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "Common options for all rpm modes:"
+#~ msgstr "Tüm rpm kipleri için ortak seçenekler:"
+
+#~ msgid "--replacefiles may only be specified during package installation"
+#~ msgstr "--replacefiles sadece paket kurulumu sýrasýnda kullanýlabilir"
+
+#~ msgid "line %d: File name not permitted: %s\n"
+#~ msgstr "satýr %d: Dosya adý uygun deđil: %s\n"
+
+#~ msgid "install even if the package replaces installed files"
+#~ msgstr "paket dosyalarý mevcut dosyalarla yer deđiţtirse bile paketi kurar"
+
+#~ msgid "query of %s failed\n"
+#~ msgstr "%s 'nin sorgulamasý baţarýsýzlýkla sonuçlandý\n"
+
+#~ msgid "old format source packages cannot be queried\n"
+#~ msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
+
+#~ msgid "no packages\n"
+#~ msgstr "paket yok\n"
+
 #~ msgid "excluding multilib path %s%s\n"
 #~ msgstr "multilib dosya yolu dýţlanýyor %s%s\n"
 
@@ -4003,10 +4339,6 @@ msgstr ""
 #~ msgid "Old (internal-only) signature!  How did you get that!?\n"
 #~ msgstr "Eski imza !!! Bunu nasýl aldýn!?\n"
 
-#, fuzzy
-#~ msgid "%s: running %s scriptlet\n"
-#~ msgstr "%s: %s betiđi çalýţtýrýlýyor (varsa)\n"
-
 #~ 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"
diff --git a/popt/po/cs.po b/popt/po/cs.po
index a681d015e..20b4ec804 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/da.po b/popt/po/da.po
index 4245bbb16..f8e9e701b 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KTranslator v 0.6.0\n"
 
 #: popt.c:35
diff --git a/popt/po/de.po b/popt/po/de.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/es.po b/popt/po/es.po
index c83b3ca02..c26399420 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/eu_ES.po
+++ b/popt/po/eu_ES.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/fi.po b/popt/po/fi.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/fr.po b/popt/po/fr.po
index 04f0908ab..06bde25ea 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -11,6 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.8.1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
@@ -18,7 +19,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/gl.po b/popt/po/gl.po
index c9fbfd8a0..0f783f8ff 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index 550c065eb..0cd41f260 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/id.po b/popt/po/id.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/is.po b/popt/po/is.po
index 0b3c9d59d..4a117adac 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/it.po b/popt/po/it.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/ja.po b/popt/po/ja.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/ko.po b/popt/po/ko.po
index dfe8f83e9..e50db5303 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/no.po b/popt/po/no.po
index 419af66df..3872b9981 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index 79ece5b0f..c2c903230 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -5,6 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.9-20030515\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
@@ -12,7 +13,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/pt.po b/popt/po/pt.po
index e31598542..ecd8a3ba4 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/ro.po b/popt/po/ro.po
index 6cb8546ca..83f797686 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index 6289aa367..728df7d65 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index 4c4b75fa8..aa48f9dcc 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,6 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
@@ -12,7 +13,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/sl.po b/popt/po/sl.po
index 5c8e4c6dc..65d6260ba 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/sr.po b/popt/po/sr.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/sv.po b/popt/po/sv.po
index f3e98d831..087dbbe09 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index 49fbc1d22..ab97780e4 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 0ddd5b98d..7864ad453 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,6 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
@@ -12,7 +13,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/wa.po b/popt/po/wa.po
index 6176007e6..6d6740cdf 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,6 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
@@ -16,7 +17,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/zh.po b/popt/po/zh.po
index c689f2426..df3d2aef4 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index 691ffe179..96fdf05e7 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/python/Makefile.am b/python/Makefile.am
index 4be002e00..3cb04ea25 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -7,7 +7,7 @@ LINT = splint
 pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
 pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
 
-SUBDIRS = rpmdb # rpm
+SUBDIRS = rpmdb rpm
 
 EXTRA_DIST = system.h rpmdebug-py.c
 
diff --git a/rpm.spec.in b/rpm.spec.in
index 023b7c80c..9c782ca26 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -20,7 +20,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.22
+Release: 0.1
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 License: GPL
@@ -190,8 +190,6 @@ gzip -9n apidocs/man/man*/* || :
 
 # Get rid of unpackaged files
 { cd $RPM_BUILD_ROOT
-  rm -rf .%{__includedir}/beecrypt
-  rm -f .%{__libdir}/libbeecrypt.{a,la,so.2.2.0}
   rm -f .%{__prefix}/lib/rpm/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req}
   rm -rf .%{__mandir}/{fr,ko}
 }
@@ -223,12 +221,12 @@ exit 0
 # Establish correct rpmdb ownership.
 /bin/chown @RPMUSER@.@RPMGROUP@ /var/lib/rpm/[A-Z]*
 
-# XXX Detect (and remove) incompatible dbenv files during db-4.2.52 upgrade.
+# XXX Detect (and remove) incompatible dbenv files during db-4.3.14 upgrade.
 # XXX Removing dbenv files in %%post opens a lock race window, a tolerable
 # XXX risk compared to the support issues involved with upgrading Berkeley DB.
 [ -w /var/lib/rpm/__db.001 ] &&
 /usr/lib/rpm/rpmdb_stat -CA -h /var/lib/rpm 2>&1 |
-grep "db_stat: Program version 4.2 doesn't match environment version" 2>&1 > /dev/null &&
+grep "db_stat: Program version 4.3 doesn't match environment version" 2>&1 > /dev/null &&
 	rm -f /var/lib/rpm/__db*
                                                                                 
 %endif
@@ -300,9 +298,10 @@ exit 0
 %attr(0644, @RPMUSER@, @RPMGROUP@)	%{__prefix}/lib/rpm/rpmpopt*
 %attr(0644, @RPMUSER@, @RPMGROUP@)	%{__prefix}/lib/rpm/rpmrc
 
-%ifarch i386 i486 i586 i686 athlon
+%ifarch i386 i486 i586 i686 athlon pentium3 pentium4
 %attr(-, @RPMUSER@, @RPMGROUP@)		%{__prefix}/lib/rpm/i[3456]86*
 %attr(-, @RPMUSER@, @RPMGROUP@)		%{__prefix}/lib/rpm/athlon*
+%attr(-, @RPMUSER@, @RPMGROUP@)		%{__prefix}/lib/rpm/pentium*
 %endif
 %ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
 %attr(-, @RPMUSER@, @RPMGROUP@)		%{__prefix}/lib/rpm/alpha*
@@ -420,7 +419,8 @@ exit 0
 %if %{with_python_subpackage}
 %files python
 %defattr(-,root,root)
-%{__libdir}/python%{with_python_version}/site-packages/rpmmodule.so
+%{__libdir}/python%{with_python_version}/site-packages/poptmodule*
+%{__libdir}/python%{with_python_version}/site-packages/rpm
 %{__libdir}/python%{with_python_version}/site-packages/rpmdb
 %endif
 
@@ -488,82 +488,30 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
-* Tue Mar 16 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.22
-- fix: grrr, skip notes on non-i386 entirely.
-
-* Fri Mar 12 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.21
-- fix: increase file context regex parse buffer to BUFSIZ.
-- fix: handle elf64 note sections correctly.
-
-* Wed Mar 10 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.20
-- add sparcv8 and enable elf32/elf64 Zon sparc64 (#117302).
-- fix: --querybynumber looped.
-- fix: ENOTSUP filter from lsetfilecon borkage.
-
-* Tue Mar  9 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.19
-- fix: sq->reaped needs sighold(SIGCHLD)/sigrelease(SIGCHLD) (#117620).
-
-* Fri Mar  5 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.18
-- selinux: ignore ENOTSUP return from lsetfilecon.
-
-* Mon Mar  1 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.17
-- permit globs in macrofiles: directive (#117217).
-- fix: segfault generating transaction serialization lock path.
-- use /etc/security/selinux/file_contexts instead.
-
-* Wed Feb 25 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.15
-- serialize rpmtsRun() using fcntl on /var/lock/rpm/transaction.
-
-* Sun Feb 22 2004 Jeff Johnson <jbj@jbj,org> 4.3-0.14
-- add ia32e arch.
-- stable sort for policy specifications, patterns before paths.
-- set "rpm_script_t" exec type for scriptlets iff /bin/sh, else default.
-- force FD_CLOEXEC on 1st 100 inherited fdno's.
-
-* Fri Feb 20 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.13
-- fix: only first "mkdir -p" directory had context set.
-
-* Wed Feb 18 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.12
-- python: add patch to rpm-4_3 to initialize RE contexts.
-
-* Sun Feb 15 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.11
-- fix: set fcontext from pkg when file_contexts doesn't exist (#114040).
-- fix: set fcontext for "mkdir -p" directories not in packages.
-- fix: setfiles (aka rpmsx.c) dinna handle patterns correctly.
-- establish rpm_script_t before scriptlet exec.
-
-* Wed Feb 11 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.10
-- re-add --enable-posixmutexes to build.
-
-* Mon Jan 19 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.9
-- python: return None for NEVRAO, [] for everything else.
-
-* Mon Jan 12 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.7
-- fix: handle files w/o contexts correctly.
-
-* Mon Jan  5 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.6
-- selinux phases 1 and 2 delivered.
-
-* Tue Dec 23 2003 Jeff Johnson <jbj@redhat.com> 4.3-0.5
-- plug some rpmbuild memory leaks.
-- file security contexts added to package header.
-
-* Mon Dec 22 2003 Jeff Johnson <jbj@redhat.com> 4.3-0.4
-- test build with methods needed for selinux.
-
-* Wed Dec 17 2003 Jeff Johnson <jbj@jbj.org> 4.3-0.3
-- detect (and remove) dbenv files while upgrading to db-4.2.52.
-- fix: dangling pointer brain fart (#107835).
-- fix: ds.Single() method needs malloc'd elements (#109919).
-
-* Sun Dec  7 2003 Jeff Johnson <jbj@jbj.org> 4.3-0.2
-- only internal Berkeley db from now on.
-- revive "make dist".
-
-* Wed Mar 19 2003 Jeff Johnson <jbj@redhat.com> 4.3-0.1
-- upgrade to zlib-1.2.beta7.
-- pass structure pointer, not args, through headerSprintf call chain.
-- add ":xml" tag format modifier.
-- --queryformat '[%%{*:xml}\n]' to dump header content in XML.
-- fix: short option help missing string terminator.
-- unify signal handling in librpmio, use condvar to deliver signal.
+* Wed Oct 27 2004 Jeff Johnson <jbj@jbj.org> rpm-4.4-0.1
+- pentium3/pentium4 arch support (pluto@PLD).
+- cpuid() cleanups for PIC/non-PIC and gcc 3.4 (pluto@PLD).
+- rpmGlob() is now locale independent (wiget@PLD).
+- conditional build support/unification (jajcus,malekith,qboosh,wiget@PLD).
+- fix: readelf.c breakage on some non x86 arches (qboosh@PLD).
+- find-lang.sh: implemented --with-kde (finds KDE help files);
+- add --all-name option (finds every lang file); drop defattr()
+  from *.lang files (arekm,mkochano,pascalek,wiget@PLD).
+- add type to tag array.
+- add Disttag: syntax to spec file parser and header content.
+- define Suggests:/Enhances: and Priority: tag values.
+- prevent RPMSENSE_PREREQ from being set or tested.
+- python: add rpm.ps() object to carry problem set info.
+- python: permit rpm.ds() analogue to hdr.dsFromHeader() creator.
+- python: permit rpm.fi() analogue to hdr.fiFromHeader() creator.
+- silently add default %defattr(-,root,root) for all packages.
+- fix: don't set handler if SIG_IGN is already set (#134474).
+- disable expensive header+payload verifies in default config.
+- adjust digest/signature stats to count #pkgs and bytes.
+- obsolete Serial:, Copyright:, and RHNPlatform: syntax in spec files.
+- permit Obsoletes: /path/to/file.
+- permit Conflicts: /path/to/file.
+- free rpmrc when looping on --target arches (#127730).
+- port to internal file-4.10 libmagic rather than libfmagic.
+- fix: handle non-unique dirnames in rpmalAdd().
+- integrate rpmgi "generic iterator" with query/verify.