Explicit branchstate annotations.

CVS patchset: 5113
CVS date: 2001/10/15 17:53:34

1 files changed, 514 insertions, 513 deletions

diff --git a/po/wa.po b/po/wa.po
index 9eb6a0b3b..04c7fe7ac 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-15 00:19-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-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"
@@ -19,53 +19,53 @@ msgstr ""
 msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:47
+#: build.c:48
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:79
+#: build.c:81
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:154 build.c:166
+#: build.c:158 build.c:170
 #, c-format
 msgid "Failed to open tar pipe: %m\n"
 msgstr ""
 
 #. Give up
-#: build.c:173
+#: build.c:177
 #, c-format
 msgid "Failed to read spec file from %s\n"
 msgstr ""
 
-#: build.c:201
+#: build.c:205
 #, c-format
 msgid "Failed to rename %s to %s: %m\n"
 msgstr ""
 
-#: build.c:240
+#: build.c:244
 #, c-format
 msgid "failed to stat %s: %m\n"
 msgstr ""
 
-#: build.c:245
+#: build.c:249
 #, c-format
 msgid "File %s is not a regular file.\n"
 msgstr ""
 
-#: build.c:254
+#: build.c:258
 #, c-format
 msgid "File %s does not appear to be a specfile.\n"
 msgstr ""
 
 #. parse up the build operators
-#: build.c:310
+#: build.c:314
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:325
+#: build.c:329
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
@@ -75,16 +75,16 @@ msgstr ""
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:245
+#: rpm.c:238 rpmqv.c:246
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:251
+#: rpm.c:242 rpmqv.c:253
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:243 rpmqv.c:252
+#: rpm.c:243 rpmqv.c:254
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -507,11 +507,11 @@ msgid ""
 "options as -q"
 msgstr ""
 
-#: lib/poptI.c:148 rpm.c:420 rpm.c:462 rpm.c:497
+#: lib/poptI.c:151 rpm.c:420 rpm.c:462 rpm.c:497
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptK.c:68 rpm.c:422
+#: lib/poptK.c:69 rpm.c:422
 msgid "do not verify file md5 checksums"
 msgstr ""
 
@@ -531,7 +531,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: lib/poptI.c:144 rpm.c:431
+#: lib/poptI.c:147 rpm.c:431
 msgid "install package"
 msgstr ""
 
@@ -551,7 +551,7 @@ msgstr ""
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: lib/poptI.c:109 rpm.c:437
+#: lib/poptI.c:112 rpm.c:437
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -559,47 +559,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: lib/poptI.c:194 rpm.c:439
+#: lib/poptI.c:197 rpm.c:439
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:118 rpm.c:443
+#: lib/poptI.c:121 rpm.c:443
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:124 rpm.c:445
+#: lib/poptI.c:127 rpm.c:445
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:130 rpm.c:447
+#: lib/poptI.c:133 rpm.c:447
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:95 rpm.c:449
+#: lib/poptI.c:98 rpm.c:449
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:133 rpm.c:452
+#: lib/poptI.c:136 rpm.c:452
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:139 rpm.c:454
+#: lib/poptI.c:142 rpm.c:454
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:136 rpm.c:456
+#: lib/poptI.c:139 rpm.c:456
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:141 rpm.c:458
+#: lib/poptI.c:144 rpm.c:458
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:146 rpm.c:460 rpm.c:495
+#: lib/poptI.c:149 rpm.c:460 rpm.c:495
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:151 rpm.c:464 rpm.c:499
+#: lib/poptI.c:154 rpm.c:464 rpm.c:499
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -611,19 +611,19 @@ msgstr ""
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:192 rpm.c:470
+#: lib/poptI.c:195 rpm.c:470
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:204 rpm.c:472
+#: lib/poptI.c:207 rpm.c:472
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:207 rpm.c:474
+#: lib/poptI.c:210 rpm.c:474
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:212 rpm.c:478
+#: lib/poptI.c:215 rpm.c:478
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -639,7 +639,7 @@ msgstr ""
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: lib/poptI.c:188 rpm.c:485
+#: lib/poptI.c:191 rpm.c:485
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -653,11 +653,11 @@ msgstr ""
 msgid "    -e <package>          "
 msgstr ""
 
-#: lib/poptI.c:115 rpm.c:489
+#: lib/poptI.c:118 rpm.c:489
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:99 rpm.c:491
+#: lib/poptI.c:102 rpm.c:491
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -766,7 +766,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: lib/poptK.c:55 rpm.c:546
+#: lib/poptK.c:56 rpm.c:546
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: lib/poptK.c:53 rpm.c:548
+#: lib/poptK.c:54 rpm.c:548
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,15 +786,15 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: lib/poptK.c:59 rpm.c:551
+#: lib/poptK.c:60 rpm.c:551
 msgid "verify package signature"
 msgstr ""
 
-#: lib/poptK.c:65 rpm.c:553
+#: lib/poptK.c:66 rpm.c:553
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: lib/poptK.c:62 rpm.c:555
+#: lib/poptK.c:63 rpm.c:555
 msgid "skip any GPG signatures"
 msgstr ""
 
@@ -827,8 +827,8 @@ msgid ""
 msgstr ""
 
 #: rpm.c:728 rpm.c:734 rpm.c:743 rpm.c:765 rpm.c:771 rpm.c:778 rpm.c:786
-#: rpm.c:794 rpm.c:815 rpm.c:821 rpm.c:884 rpmqv.c:646 rpmqv.c:652 rpmqv.c:658
-#: rpmqv.c:696
+#: rpm.c:794 rpm.c:815 rpm.c:821 rpm.c:884 rpmqv.c:648 rpmqv.c:654 rpmqv.c:660
+#: rpmqv.c:698
 msgid "only one major mode may be specified"
 msgstr ""
 
@@ -840,23 +840,23 @@ msgstr ""
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: lib/poptI.c:57 rpm.c:827
+#: lib/poptI.c:59 rpm.c:827
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:59 rpm.c:829
+#: lib/poptI.c:61 rpm.c:829
 msgid "relocations must contain a ="
 msgstr ""
 
-#: lib/poptI.c:62 rpm.c:832
+#: lib/poptI.c:64 rpm.c:832
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:45 rpm.c:841
+#: lib/poptI.c:47 rpm.c:841
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:598
+#: rpm.c:850 rpmqv.c:600
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -864,101 +864,101 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:605
+#: rpm.c:856 rpmqv.c:607
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:675
+#: rpm.c:891 rpmqv.c:677
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:679
+#: rpm.c:896 rpmqv.c:681
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:682
+#: rpm.c:899 rpmqv.c:684
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:902 rpmqv.c:685
+#: rpm.c:902 rpmqv.c:687
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:905 rpmqv.c:729
+#: rpm.c:905 rpmqv.c:731
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:731
+#: rpm.c:908 rpmqv.c:733
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:911 rpmqv.c:734
+#: rpm.c:911 rpmqv.c:736
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:914 rpmqv.c:737
+#: rpm.c:914 rpmqv.c:739
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:917 rpmqv.c:740
+#: rpm.c:917 rpmqv.c:742
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:743
+#: rpm.c:920 rpmqv.c:745
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:923 rpmqv.c:746
+#: rpm.c:923 rpmqv.c:748
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:927 rpmqv.c:750
+#: rpm.c:927 rpmqv.c:752
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:931 rpmqv.c:755
+#: rpm.c:931 rpmqv.c:757
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:935 rpmqv.c:759
+#: rpm.c:935 rpmqv.c:761
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:939 rpmqv.c:763
+#: rpm.c:939 rpmqv.c:765
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:943 rpmqv.c:767
+#: rpm.c:943 rpmqv.c:769
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:771
+#: rpm.c:947 rpmqv.c:773
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:775
+#: rpm.c:951 rpmqv.c:777
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:955 rpmqv.c:779
+#: rpm.c:955 rpmqv.c:781
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:959 rpmqv.c:784
+#: rpm.c:959 rpmqv.c:786
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:963 rpmqv.c:788
+#: rpm.c:963 rpmqv.c:790
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:792
+#: rpm.c:967 rpmqv.c:794
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:971 rpmqv.c:797
+#: rpm.c:971 rpmqv.c:799
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
@@ -972,31 +972,31 @@ msgstr ""
 msgid "--apply may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:807
+#: rpm.c:987 rpmqv.c:809
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:811
+#: rpm.c:991 rpmqv.c:813
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:816
+#: rpm.c:996 rpmqv.c:818
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:1000 rpmqv.c:821
+#: rpm.c:1000 rpmqv.c:823
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:1012 rpmqv.c:833
+#: rpm.c:1012 rpmqv.c:835
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
@@ -1017,77 +1017,77 @@ msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:1038 rpmqv.c:854
+#: rpm.c:1038 rpmqv.c:858
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1043 rpmqv.c:859
+#: rpm.c:1043 rpmqv.c:863
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:1058 rpmqv.c:878
+#: rpm.c:1058 rpmqv.c:882
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:1062 rpmqv.c:883
+#: rpm.c:1062 rpmqv.c:887
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:885
+#: rpm.c:1064 rpmqv.c:889
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:1067 rpmqv.c:889
+#: rpm.c:1067 rpmqv.c:893
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1072 rpmqv.c:894
+#: rpm.c:1072 rpmqv.c:898
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1078 rpmqv.c:901
+#: rpm.c:1078 rpmqv.c:905
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1093 rpmqv.c:917
+#: rpm.c:1093 rpmqv.c:922
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1116 rpmqv.c:1133
+#: rpm.c:1116 rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1127 rpmqv.c:1142
+#: rpm.c:1127 rpmqv.c:1149
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1138 rpmqv.c:1151
+#: rpm.c:1138 rpmqv.c:1158
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1035
+#: rpm.c:1154 rpmqv.c:1040
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1243 rpmqv.c:1046
+#: rpm.c:1243 rpmqv.c:1051
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1267 rpmqv.c:1096
+#: rpm.c:1267 rpmqv.c:1103
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1272 rpmqv.c:1105
+#: rpm.c:1272 rpmqv.c:1112
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1289 rpmqv.c:1121
+#: rpm.c:1289 rpmqv.c:1128
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1293 rpmqv.c:1125
+#: rpm.c:1293 rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1128,7 +1128,7 @@ msgstr ""
 msgid "<cmd>"
 msgstr ""
 
-#: lib/poptI.c:195 rpmqv.c:143
+#: lib/poptI.c:198 rpmqv.c:143
 msgid "<dir>"
 msgstr ""
 
@@ -1194,57 +1194,57 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:264
+#: rpmqv.c:266
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:599
+#: rpmqv.c:601
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:723
+#: rpmqv.c:725
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:802
+#: rpmqv.c:804
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:947
+#: rpmqv.c:952
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1016
+#: rpmqv.c:1021
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1018
+#: rpmqv.c:1023
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:123 build/pack.c:463
+#: build/build.c:125 build/pack.c:467
 msgid "Unable to open temp file.\n"
 msgstr ""
 
-#: build/build.c:202
+#: build/build.c:209
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:208
+#: build/build.c:215
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr ""
 
-#: build/build.c:217
+#: build/build.c:224
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:317
+#: build/build.c:324
 msgid ""
 "\n"
 "\n"
@@ -1267,214 +1267,214 @@ msgstr ""
 msgid "parse error in expression\n"
 msgstr ""
 
-#: build/expression.c:341
+#: build/expression.c:342
 msgid "unmatched (\n"
 msgstr ""
 
-#: build/expression.c:371
+#: build/expression.c:372
 msgid "- only on numbers\n"
 msgstr ""
 
-#: build/expression.c:387
+#: build/expression.c:388
 msgid "! only on numbers\n"
 msgstr ""
 
-#: build/expression.c:431 build/expression.c:481 build/expression.c:541
-#: build/expression.c:635
+#: build/expression.c:434 build/expression.c:486 build/expression.c:548
+#: build/expression.c:644
 msgid "types must match\n"
 msgstr ""
 
-#: build/expression.c:444
+#: build/expression.c:447
 msgid "* / not suported for strings\n"
 msgstr ""
 
-#: build/expression.c:497
+#: build/expression.c:502
 msgid "- not suported for strings\n"
 msgstr ""
 
-#: build/expression.c:648
+#: build/expression.c:657
 msgid "&& and || not suported for strings\n"
 msgstr ""
 
-#: build/expression.c:681 build/expression.c:728
+#: build/expression.c:691 build/expression.c:738
 msgid "syntax error in expression\n"
 msgstr ""
 
-#: build/files.c:272
+#: build/files.c:274
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:331 build/files.c:523 build/files.c:706
+#: build/files.c:333 build/files.c:525 build/files.c:708
 #, c-format
 msgid "Missing '(' in %s %s\n"
 msgstr ""
 
-#: build/files.c:342 build/files.c:648 build/files.c:717
+#: build/files.c:344 build/files.c:650 build/files.c:719
 #, c-format
 msgid "Missing ')' in %s(%s\n"
 msgstr ""
 
-#: build/files.c:380 build/files.c:673
+#: build/files.c:382 build/files.c:675
 #, c-format
 msgid "Invalid %s token: %s\n"
 msgstr ""
 
-#: build/files.c:486
+#: build/files.c:488
 #, c-format
 msgid "Missing %s in %s %s\n"
 msgstr ""
 
-#: build/files.c:539
+#: build/files.c:541
 #, c-format
 msgid "Non-white space follows %s(): %s\n"
 msgstr ""
 
-#: build/files.c:577
+#: build/files.c:579
 #, c-format
 msgid "Bad syntax: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:587
+#: build/files.c:589
 #, c-format
 msgid "Bad mode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:599
+#: build/files.c:601
 #, c-format
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr ""
 
-#: build/files.c:744
+#: build/files.c:746
 #, c-format
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
 msgstr ""
 
 #. @innercontinue@
-#: build/files.c:755
+#: build/files.c:757
 #, c-format
 msgid "Duplicate locale %.*s in %%lang(%s)\n"
 msgstr ""
 
-#: build/files.c:906
+#: build/files.c:908
 #, c-format
 msgid "Hit limit for %%docdir\n"
 msgstr ""
 
-#: build/files.c:912
+#: build/files.c:914
 #, c-format
 msgid "Only one arg for %%docdir\n"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:940
+#: build/files.c:942
 #, c-format
 msgid "Two files on one line: %s\n"
 msgstr ""
 
-#: build/files.c:954
+#: build/files.c:957
 #, c-format
 msgid "File must begin with \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:966
+#: build/files.c:970
 #, c-format
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
 #. Two entries for the same file found, merge the entries.
-#: build/files.c:1143
+#: build/files.c:1147
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1276
+#: build/files.c:1280
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1477
+#: build/files.c:1485
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1501
+#: build/files.c:1509
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1544 build/files.c:2148 build/parsePrep.c:50
+#: build/files.c:1552 build/files.c:2164 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1556
+#: build/files.c:1564
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1660
+#: build/files.c:1668
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1683
+#: build/files.c:1691
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1697
+#: build/files.c:1706
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1758
+#: build/files.c:1768
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1769 build/pack.c:148
+#: build/files.c:1779 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2136
+#: build/files.c:2152
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:2208
+#: build/files.c:2224
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/files.c:2213
+#: build/files.c:2229
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/files.c:2295
+#: build/files.c:2311
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: build/files.c:2299
+#: build/files.c:2315
 #, c-format
 msgid "failed to write all data to %s\n"
 msgstr ""
 
-#: build/files.c:2434
+#: build/files.c:2450
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:2460 build/files.c:2474
+#: build/files.c:2476 build/files.c:2490
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2611
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1568,7 +1568,7 @@ msgstr ""
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305 build/pack.c:505
+#: build/pack.c:305 build/pack.c:509
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
@@ -1583,82 +1583,82 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:451
+#: build/pack.c:455
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:469
+#: build/pack.c:473
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:477
+#: build/pack.c:481
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:512
+#: build/pack.c:516
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:530
+#: build/pack.c:534
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:543
+#: build/pack.c:547
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:551
+#: build/pack.c:555
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:587 lib/psm.c:1550
+#: build/pack.c:591 lib/psm.c:1564
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:602
+#: build/pack.c:606
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:612
+#: build/pack.c:616
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:626
+#: build/pack.c:630
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:636
+#: build/pack.c:640
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:642
+#: build/pack.c:646
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:667 lib/psm.c:1809
+#: build/pack.c:671 lib/psm.c:1823
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:734
+#: build/pack.c:738
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:751
+#: build/pack.c:755
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:30
+#: build/parseBuildInstallClean.c:32
 #, c-format
 msgid "line %d: second %s\n"
 msgstr ""
@@ -1698,17 +1698,17 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:58 build/parseFiles.c:53 build/parseScript.c:195
+#: build/parseDescription.c:58 build/parseFiles.c:53 build/parseScript.c:197
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:71 build/parseFiles.c:65 build/parseScript.c:207
+#: build/parseDescription.c:71 build/parseFiles.c:65 build/parseScript.c:209
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:81 build/parseFiles.c:74 build/parseScript.c:216
+#: build/parseDescription.c:81 build/parseFiles.c:74 build/parseScript.c:218
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
@@ -1794,57 +1794,57 @@ msgstr ""
 msgid "line %d: Illegal char '-' in %s: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:565 build/parseSpec.c:400
+#: build/parsePreamble.c:569 build/parseSpec.c:404
 #, c-format
 msgid "BuildRoot can not be \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:578
+#: build/parsePreamble.c:582
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:590
+#: build/parsePreamble.c:594
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:602
+#: build/parsePreamble.c:606
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:642 build/parsePreamble.c:653
+#: build/parsePreamble.c:646 build/parsePreamble.c:657
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:679
+#: build/parsePreamble.c:683
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:688
+#: build/parsePreamble.c:692
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:842
+#: build/parsePreamble.c:847
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:848
+#: build/parsePreamble.c:853
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:875
+#: build/parsePreamble.c:880
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:897
+#: build/parsePreamble.c:902
 msgid "Spec file can't use BuildRoot\n"
 msgstr ""
 
@@ -1933,27 +1933,27 @@ msgstr ""
 msgid "line %d: Versioned file name not permitted: %s\n"
 msgstr ""
 
-#: build/parseReqs.c:174
+#: build/parseReqs.c:175
 #, c-format
 msgid "line %d: Version required: %s\n"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:163
 #, c-format
 msgid "line %d: triggers must have --: %s\n"
 msgstr ""
 
-#: build/parseScript.c:171 build/parseScript.c:232
+#: build/parseScript.c:173 build/parseScript.c:234
 #, c-format
 msgid "line %d: Error parsing %s: %s\n"
 msgstr ""
 
-#: build/parseScript.c:182
+#: build/parseScript.c:184
 #, c-format
 msgid "line %d: script program must begin with '/': %s\n"
 msgstr ""
 
-#: build/parseScript.c:224
+#: build/parseScript.c:226
 #, c-format
 msgid "line %d: Second %s\n"
 msgstr ""
@@ -1964,41 +1964,41 @@ msgid "line %d: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:195
+#: build/parseSpec.c:196
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:208
+#: build/parseSpec.c:210
 #, c-format
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:280
+#: build/parseSpec.c:282
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:289
+#: build/parseSpec.c:291
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:301
+#: build/parseSpec.c:303
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:315 build/parseSpec.c:324
+#: build/parseSpec.c:317 build/parseSpec.c:326
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:518
+#: build/parseSpec.c:522
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:573
+#: build/parseSpec.c:579
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -2013,119 +2013,119 @@ msgstr ""
 msgid "line %d: Bad no%s number: %d\n"
 msgstr ""
 
-#: build/spec.c:292
+#: build/spec.c:294
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:187
+#: lib/cpio.c:188
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:190
+#: lib/cpio.c:191
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:191
+#: lib/cpio.c:192
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:212
+#: lib/cpio.c:213
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:213
+#: lib/cpio.c:214
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:214
+#: lib/cpio.c:215
 msgid "Missing hard link(s)"
 msgstr ""
 
-#: lib/cpio.c:215
+#: lib/cpio.c:216
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:216
+#: lib/cpio.c:217
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:217
+#: lib/cpio.c:218
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/cpio.c:226
+#: lib/cpio.c:229
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:572
+#: lib/depends.c:574
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:601
+#: lib/depends.c:603
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:602 lib/depends.c:1224 lib/depends.c:1357
+#: lib/depends.c:604 lib/depends.c:1236 lib/depends.c:1369
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:602 lib/depends.c:1224 lib/depends.c:1357
+#: lib/depends.c:604 lib/depends.c:1236 lib/depends.c:1369
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1020
+#: lib/depends.c:1030
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1131
+#: lib/depends.c:1141
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1223
+#: lib/depends.c:1235
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1252
+#: lib/depends.c:1264
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1269
+#: lib/depends.c:1281
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1305
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1306
+#: lib/depends.c:1318
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1320
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1336
+#: lib/depends.c:1348
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1357
+#: lib/depends.c:1369
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -2133,47 +2133,47 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1430
+#: lib/depends.c:1442
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1509
+#: lib/depends.c:1521
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1760
+#: lib/depends.c:1774
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1909
+#: lib/depends.c:1924
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1969
+#: lib/depends.c:1984
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2019
+#: lib/depends.c:2034
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2071
+#: lib/depends.c:2087
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2100
+#: lib/depends.c:2117
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2639 lib/header.c:2660 lib/header.c:2682
+#: lib/header.c:2653 lib/header.c:2674 lib/header.c:2696
 msgid "(not a number)"
 msgstr ""
 
@@ -2200,7 +2200,7 @@ msgstr ""
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:159 rpmio/url.c:495
+#: lib/fs.c:159 rpmio/url.c:499
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
@@ -2219,37 +2219,37 @@ msgstr ""
 msgid "%9d %s\n"
 msgstr ""
 
-#: lib/fsm.c:1141
+#: lib/fsm.c:1160
 #, c-format
 msgid "%s directory created with perms %04o.\n"
 msgstr ""
 
-#: lib/fsm.c:1419
+#: lib/fsm.c:1439
 #, c-format
 msgid "archive file %s was not found in header file list\n"
 msgstr ""
 
-#: lib/fsm.c:1538 lib/fsm.c:1663
+#: lib/fsm.c:1558 lib/fsm.c:1683
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1689
+#: lib/fsm.c:1709
 #, c-format
 msgid "%s rmdir of %s failed: Directory not empty\n"
 msgstr ""
 
-#: lib/fsm.c:1695
+#: lib/fsm.c:1715
 #, c-format
 msgid "%s rmdir of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1705
+#: lib/fsm.c:1725
 #, c-format
 msgid "%s unlink of %s failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1724
+#: lib/fsm.c:1744
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
@@ -2261,87 +2261,87 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:304 lib/header_internal.c:159 lib/psm.c:403
+#: lib/header.c:304 lib/header_internal.c:159 lib/psm.c:405
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:1942
+#: lib/header.c:1952
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:1972
+#: lib/header.c:1982
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:1986
+#: lib/header.c:1996
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2000
+#: lib/header.c:2010
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2017
+#: lib/header.c:2027
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2044
+#: lib/header.c:2054
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2062
+#: lib/header.c:2072
 msgid "unexpected ]"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2066
+#: lib/header.c:2076
 msgid "unexpected }"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2132
+#: lib/header.c:2142
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2141
+#: lib/header.c:2151
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2154 lib/header.c:2196
+#: lib/header.c:2164 lib/header.c:2206
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2164
+#: lib/header.c:2174
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2181
+#: lib/header.c:2191
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans -readonlytrans@
-#: lib/header.c:2206
+#: lib/header.c:2216
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2399
+#: lib/header.c:2412
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/misc.c:269 lib/misc.c:274 lib/misc.c:280
+#: lib/misc.c:276 lib/misc.c:281 lib/misc.c:287
 #, c-format
 msgid "error creating temporary file %s\n"
 msgstr ""
@@ -2350,7 +2350,7 @@ msgstr ""
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:224
+#: lib/package.c:226
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
@@ -2487,250 +2487,250 @@ msgstr ""
 msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptI.c:79
+#: lib/poptI.c:81
 msgid "malformed rollback time"
 msgstr ""
 
-#: lib/poptI.c:105 lib/poptI.c:156
+#: lib/poptI.c:108 lib/poptI.c:159
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:112
+#: lib/poptI.c:115
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:118
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:120
+#: lib/poptI.c:123
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:121
+#: lib/poptI.c:124
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:127
+#: lib/poptI.c:130
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:128 lib/poptI.c:144 lib/poptI.c:216
+#: lib/poptI.c:131 lib/poptI.c:147 lib/poptI.c:219
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:159
+#: lib/poptI.c:162
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:165
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:165
+#: lib/poptI.c:168
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:168
+#: lib/poptI.c:171
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:175
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:175
+#: lib/poptI.c:178
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:178
+#: lib/poptI.c:181
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:181
+#: lib/poptI.c:184
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:184
+#: lib/poptI.c:187
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:197
+#: lib/poptI.c:200
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:198
+#: lib/poptI.c:201
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:201
+#: lib/poptI.c:204
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:209
+#: lib/poptI.c:212
 msgid "deinstall new package(s), reinstall old package(s), back to date"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:213
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:218
 msgid "upgrade package(s)"
 msgstr ""
 
-#: lib/poptK.c:57
+#: lib/poptK.c:58
 msgid "generate signature"
 msgstr ""
 
-#: lib/poptQV.c:75
+#: lib/poptQV.c:76
 msgid "query/verify all packages"
 msgstr ""
 
-#: lib/poptQV.c:77
+#: lib/poptQV.c:78
 msgid "query/verify package(s) owning file"
 msgstr ""
 
-#: lib/poptQV.c:79
+#: lib/poptQV.c:80
 msgid "query/verify package(s) in group"
 msgstr ""
 
-#: lib/poptQV.c:81
+#: lib/poptQV.c:82
 msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
-#: lib/poptQV.c:83
+#: lib/poptQV.c:84
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:87
+#: lib/poptQV.c:88
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:89
+#: lib/poptQV.c:90
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:89
+#: lib/poptQV.c:90
 msgid "<spec>"
 msgstr ""
 
-#: lib/poptQV.c:91
+#: lib/poptQV.c:92
 msgid "query the package(s) triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:93
+#: lib/poptQV.c:94
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:95
+#: lib/poptQV.c:96
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:97
+#: lib/poptQV.c:98
 msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
-#: lib/poptQV.c:99
+#: lib/poptQV.c:100
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:154
+#: lib/poptQV.c:158
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:156
+#: lib/poptQV.c:160
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:158
+#: lib/poptQV.c:162
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:160
+#: lib/poptQV.c:164
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:165
+#: lib/poptQV.c:169
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:169
+#: lib/poptQV.c:173
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:172
+#: lib/poptQV.c:176
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:178
+#: lib/poptQV.c:182
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:180
+#: lib/poptQV.c:184
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:182
+#: lib/poptQV.c:186
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:184
+#: lib/poptQV.c:188
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/poptQV.c:201
+#: lib/poptQV.c:205
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:208
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:211
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:210
+#: lib/poptQV.c:214
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:217
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:216
+#: lib/poptQV.c:220
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:219 lib/poptQV.c:222
+#: lib/poptQV.c:223 lib/poptQV.c:226
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:225
+#: lib/poptQV.c:229
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:227
+#: lib/poptQV.c:231
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:229 lib/poptQV.c:233
+#: lib/poptQV.c:233 lib/poptQV.c:237
 msgid "don't execute %verifyscript (if any)"
 msgstr ""
 
-#: lib/poptQV.c:236
+#: lib/poptQV.c:240
 msgid "don't verify header SHA1 digest"
 msgstr ""
 
@@ -2799,74 +2799,74 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:599
+#: lib/psm.c:601
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:605
+#: lib/psm.c:607
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:643
+#: lib/psm.c:645
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:756
+#: lib/psm.c:758
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1020
+#: lib/psm.c:1029
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1027
+#: lib/psm.c:1036
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1355
+#: lib/psm.c:1369
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1472
+#: lib/psm.c:1486
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:1587
+#: lib/psm.c:1601
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1596
+#: lib/psm.c:1610
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1635
+#: lib/psm.c:1649
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1636
+#: lib/psm.c:1650
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1817
+#: lib/psm.c:1831
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1820
+#: lib/psm.c:1834
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1926
 #, c-format
 msgid "%s: running %s script(s) (if any)\n"
 msgstr ""
@@ -2876,119 +2876,119 @@ msgstr ""
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:214
+#: lib/query.c:216
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:277
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:278
+#: lib/query.c:280
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:281
+#: lib/query.c:283
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:284
+#: lib/query.c:286
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:287
+#: lib/query.c:289
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:294
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:311 lib/query.c:367
+#: lib/query.c:313 lib/query.c:369
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:454
+#: lib/query.c:458
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:590 lib/query.c:624 lib/rpminstall.c:313 lib/rpminstall.c:457
-#: lib/rpminstall.c:829
+#: lib/query.c:596 lib/query.c:630 lib/rpminstall.c:317 lib/rpminstall.c:461
+#: lib/rpminstall.c:839
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:603
+#: lib/query.c:609
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:609
+#: lib/query.c:615
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:634 lib/rpminstall.c:470
+#: lib/query.c:640 lib/rpminstall.c:474
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:676
+#: lib/query.c:682
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:698
+#: lib/query.c:704
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:717
+#: lib/query.c:723
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:727
+#: lib/query.c:733
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:737
+#: lib/query.c:743
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:748
+#: lib/query.c:754
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:785
+#: lib/query.c:791
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:789
+#: lib/query.c:795
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:815
+#: lib/query.c:821
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:818
+#: lib/query.c:824
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:823
+#: lib/query.c:829
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:834 lib/rpminstall.c:619
+#: lib/query.c:840 lib/rpminstall.c:625
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3012,158 +3012,158 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:147 lib/rpmchecksig.c:291
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:294
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:156
+#: lib/rpmchecksig.c:157
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:307
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:310
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:169 lib/rpmchecksig.c:312
+#: lib/rpmchecksig.c:170 lib/rpmchecksig.c:315
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:210
+#: lib/rpmchecksig.c:211
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:297
+#: lib/rpmchecksig.c:300
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:522
+#: lib/rpmchecksig.c:525
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:523 lib/rpmchecksig.c:537
+#: lib/rpmchecksig.c:526 lib/rpmchecksig.c:540
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:525 lib/rpmchecksig.c:539
+#: lib/rpmchecksig.c:528 lib/rpmchecksig.c:542
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:526 lib/rpmchecksig.c:540
+#: lib/rpmchecksig.c:529 lib/rpmchecksig.c:543
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:528 lib/rpmchecksig.c:542
+#: lib/rpmchecksig.c:531 lib/rpmchecksig.c:545
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:536
+#: lib/rpmchecksig.c:539
 msgid "OK"
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:146
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:146
+#: lib/rpminstall.c:148
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:263
+#: lib/rpminstall.c:267
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:273
+#: lib/rpminstall.c:277
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:281
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:359
+#: lib/rpminstall.c:363
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:382
+#: lib/rpminstall.c:386
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:431
+#: lib/rpminstall.c:435
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:437
+#: lib/rpminstall.c:441
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:449 lib/rpminstall.c:688
+#: lib/rpminstall.c:453 lib/rpminstall.c:696
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:485
+#: lib/rpminstall.c:489
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:500
+#: lib/rpminstall.c:505
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:520
+#: lib/rpminstall.c:526
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:541
+#: lib/rpminstall.c:547
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:606
+#: lib/rpminstall.c:612
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:622
+#: lib/rpminstall.c:628
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:645
+#: lib/rpminstall.c:652
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:674
+#: lib/rpminstall.c:682
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:680
+#: lib/rpminstall.c:688
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -3173,98 +3173,98 @@ msgstr ""
 msgid "read failed: %s (%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:167
+#: lib/rpmrc.c:188
 #, c-format
 msgid "missing second ':' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:170
+#: lib/rpmrc.c:191
 #, c-format
 msgid "missing architecture name at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:323
+#: lib/rpmrc.c:345
 #, c-format
 msgid "Incomplete data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:328
+#: lib/rpmrc.c:350
 #, c-format
 msgid "Too many args in data line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:336
+#: lib/rpmrc.c:358
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)\n"
 msgstr ""
 
-#: lib/rpmrc.c:372
+#: lib/rpmrc.c:395
 #, c-format
 msgid "Incomplete default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:377
+#: lib/rpmrc.c:400
 #, c-format
 msgid "Too many args in default line at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:579
+#: lib/rpmrc.c:616
 #, c-format
 msgid "Cannot expand %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:584
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Cannot read %s, HOME is too large.\n"
 msgstr ""
 
-#: lib/rpmrc.c:601
+#: lib/rpmrc.c:638
 #, c-format
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:648
+#: lib/rpmrc.c:691
 #, c-format
 msgid "Failed to read %s: %s.\n"
 msgstr ""
 
-#: lib/rpmrc.c:685
+#: lib/rpmrc.c:728
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:702 lib/rpmrc.c:776
+#: lib/rpmrc.c:745 lib/rpmrc.c:819
 #, c-format
 msgid "missing argument for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:719 lib/rpmrc.c:741
+#: lib/rpmrc.c:762 lib/rpmrc.c:784
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\"\n"
 msgstr ""
 
-#: lib/rpmrc.c:728
+#: lib/rpmrc.c:771
 #, c-format
 msgid "cannot open %s at %s:%d: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:768
+#: lib/rpmrc.c:811
 #, c-format
 msgid "missing architecture for %s at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:835
+#: lib/rpmrc.c:878
 #, c-format
 msgid "bad option '%s' at %s:%d\n"
 msgstr ""
 
-#: lib/rpmrc.c:1431
+#: lib/rpmrc.c:1477
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1432
+#: lib/rpmrc.c:1478
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3389,47 +3389,47 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/transaction.c:471
+#: lib/transaction.c:472
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/transaction.c:475
+#: lib/transaction.c:476
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:478
+#: lib/transaction.c:479
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:548
+#: lib/transaction.c:549
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:612
+#: lib/transaction.c:613
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:622
+#: lib/transaction.c:623
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:701
+#: lib/transaction.c:702
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:845
+#: lib/transaction.c:846
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:1459
+#: lib/transaction.c:1460
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3447,127 +3447,128 @@ msgstr ""
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:498
+#: lib/verify.c:499
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:537
+#: lib/verify.c:539
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
 
-#: rpmdb/db1.c:100 rpmdb/db3.c:86
+#: rpmdb/db1.c:100 rpmdb/db3.c:88
 #, c-format
 msgid "db%d error(%d) from %s: %s\n"
 msgstr ""
 
-#: rpmdb/db1.c:103 rpmdb/db3.c:89
+#: rpmdb/db1.c:103 rpmdb/db3.c:91
 #, c-format
 msgid "db%d error(%d): %s\n"
 msgstr ""
 
-#: rpmdb/db1.c:168
+#: rpmdb/db1.c:170
 #, c-format
 msgid ""
 "Broken package chain at offset %d(0x%08x), attempting to reconnect ...\n"
 msgstr ""
 
-#: rpmdb/db1.c:180
+#: rpmdb/db1.c:182
 #, c-format
 msgid "Reconnecting broken chain at offset %d(0x%08x).\n"
 msgstr ""
 
-#: rpmdb/db1.c:498
+#. @=branchstate@
+#: rpmdb/db1.c:508
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: rpmdb/db1.c:501
+#: rpmdb/db1.c:511
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: rpmdb/db1.c:535
+#: rpmdb/db1.c:546
 #, c-format
 msgid "bad db file %s\n"
 msgstr ""
 
-#: rpmdb/db1.c:540
+#: rpmdb/db1.c:551
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: rpmdb/db1.c:563
+#: rpmdb/db1.c:574
 #, c-format
 msgid "cannot get %s lock on database\n"
 msgstr ""
 
-#: rpmdb/db1.c:564 rpmdb/db3.c:1156
+#: rpmdb/db1.c:575 rpmdb/db3.c:1179
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db1.c:564 rpmdb/db3.c:1156
+#: rpmdb/db1.c:575 rpmdb/db3.c:1179
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:115
+#: rpmdb/db3.c:119
 #, c-format
 msgid "closed   db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:133
+#: rpmdb/db3.c:137
 #, c-format
 msgid "removed  db environment %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:173
+#: rpmdb/db3.c:178
 #, c-format
 msgid "opening  db environment %s/%s %s\n"
 msgstr ""
 
-#: rpmdb/db3.c:670
+#: rpmdb/db3.c:692
 #, c-format
 msgid "closed   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:729
+#: rpmdb/db3.c:751
 #, c-format
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:933
+#: rpmdb/db3.c:956
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1154
+#: rpmdb/db3.c:1177
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1160
+#: rpmdb/db3.c:1183
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:394
+#: rpmdb/dbconfig.c:395
 #, c-format
 msgid "unrecognized db option: \"%s\" ignored.\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:430
+#: rpmdb/dbconfig.c:431
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:439
+#: rpmdb/dbconfig.c:440
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: rpmdb/dbconfig.c:448
+#: rpmdb/dbconfig.c:449
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
@@ -3595,303 +3596,303 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:130
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:381
+#: rpmdb/rpmdb.c:382
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:401
+#: rpmdb/rpmdb.c:402
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:493
+#: rpmdb/rpmdb.c:494
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:622
+#: rpmdb/rpmdb.c:623
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:633
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:885
+#: rpmdb/rpmdb.c:886
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1017
+#: rpmdb/rpmdb.c:1019
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1252
+#: rpmdb/rpmdb.c:1255
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2017 rpmdb/rpmdb.c:3205
+#: rpmdb/rpmdb.c:2022 rpmdb/rpmdb.c:3210
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2068
+#: rpmdb/rpmdb.c:2073
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2335
+#: rpmdb/rpmdb.c:2340
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2404
+#: rpmdb/rpmdb.c:2409
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2413
+#: rpmdb/rpmdb.c:2418
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2609
+#: rpmdb/rpmdb.c:2614
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2687
+#: rpmdb/rpmdb.c:2692
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2698
+#: rpmdb/rpmdb.c:2703
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3093
+#: rpmdb/rpmdb.c:3098
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3124
+#: rpmdb/rpmdb.c:3129
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3151
+#: rpmdb/rpmdb.c:3156
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3155
+#: rpmdb/rpmdb.c:3160
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3161
+#: rpmdb/rpmdb.c:3166
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3163
+#: rpmdb/rpmdb.c:3168
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3170
+#: rpmdb/rpmdb.c:3175
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3181
+#: rpmdb/rpmdb.c:3186
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3245
+#: rpmdb/rpmdb.c:3250
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3263
+#: rpmdb/rpmdb.c:3268
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3271
+#: rpmdb/rpmdb.c:3276
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3273
+#: rpmdb/rpmdb.c:3278
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3283
+#: rpmdb/rpmdb.c:3288
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3285
+#: rpmdb/rpmdb.c:3290
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:223
+#: rpmio/macro.c:224
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:346
+#: rpmio/macro.c:349
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:388
+#: rpmio/macro.c:392
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:618
+#: rpmio/macro.c:622
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:645
+#: rpmio/macro.c:649
 #, c-format
 msgid "Macro %%%s has illegal name (%%define)\n"
 msgstr ""
 
-#: rpmio/macro.c:651
+#: rpmio/macro.c:655
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:656
+#: rpmio/macro.c:660
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:662
+#: rpmio/macro.c:666
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:697
+#: rpmio/macro.c:701
 #, c-format
 msgid "Macro %%%s has illegal name (%%undefine)\n"
 msgstr ""
 
-#: rpmio/macro.c:808
+#: rpmio/macro.c:813
 #, c-format
 msgid "Macro %%%s (%s) was not used below level %d\n"
 msgstr ""
 
-#: rpmio/macro.c:924
+#: rpmio/macro.c:929
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1118
+#: rpmio/macro.c:1123
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)\n"
 msgstr ""
 
-#: rpmio/macro.c:1185 rpmio/macro.c:1202
+#: rpmio/macro.c:1190 rpmio/macro.c:1207
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1248
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1372
+#: rpmio/macro.c:1377
 #, c-format
 msgid "Macro %%%.*s not found, skipping\n"
 msgstr ""
 
-#: rpmio/macro.c:1448
+#: rpmio/macro.c:1453
 msgid "Target buffer overflow\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1637 rpmio/macro.c:1643
+#: rpmio/macro.c:1642 rpmio/macro.c:1648
 #, c-format
 msgid "File %s: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1646
+#: rpmio/macro.c:1651
 #, c-format
 msgid "File %s is smaller than %u bytes\n"
 msgstr ""
 
-#: rpmio/rpmio.c:631
+#: rpmio/rpmio.c:632
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:634
+#: rpmio/rpmio.c:635
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:637
+#: rpmio/rpmio.c:638
 msgid "Server I/O error"
 msgstr ""
 
-#: rpmio/rpmio.c:640
+#: rpmio/rpmio.c:641
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:643
+#: rpmio/rpmio.c:644
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:646
+#: rpmio/rpmio.c:647
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:649
+#: rpmio/rpmio.c:650
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:652
+#: rpmio/rpmio.c:653
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:655
+#: rpmio/rpmio.c:656
 msgid "I/O error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:658
+#: rpmio/rpmio.c:659
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:661
+#: rpmio/rpmio.c:662
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:664
+#: rpmio/rpmio.c:665
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:669
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1319
+#: rpmio/rpmio.c:1320
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
@@ -3920,37 +3921,37 @@ msgstr ""
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:111
+#: rpmio/url.c:113
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:131
+#: rpmio/url.c:133
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:159
+#: rpmio/url.c:161
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:255
+#: rpmio/url.c:257
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:280 rpmio/url.c:306
+#: rpmio/url.c:282 rpmio/url.c:308
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:449
+#: rpmio/url.c:453
 msgid "url port must be a number\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:515
+#: rpmio/url.c:519
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""