- popt: display sub-table options only once on --usage.

- wire --nosignatures et al as common options, rework CLI options.

CVS patchset: 5575
CVS date: 2002/07/28 00:41:15

1 files changed, 274 insertions, 294 deletions

diff --git a/po/is.po b/po/is.po
index 56273d557..5cf76b8af 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-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"
@@ -74,355 +74,263 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "prenta útgáfunúmer rpm sem verið er að nota"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "prenta útvíkkun fjölva <expr>+"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "senda frálag í <skipun>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "sýna endanlega rpmrc og stillingar fjölva"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM útgáfa %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Höfundarréttur (C) 1998-2000 - Red Hat Inc"
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+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:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr ""
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1208,7 +1116,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot þegar skilgreind, hunsa %s\n"
@@ -1629,16 +1537,104 @@ msgstr "%s: Fseek brást: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "prenta útvíkkun fjölva <expr>+"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "ekki skoða pakkaskilyrðin"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ekki skoða pakkaskilyrðin"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "ekki skoða pakkaskilyrðin"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "senda frálag í <skipun>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "sýna endanlega rpmrc og stillingar fjölva"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "prenta útgáfunúmer rpm sem verið er að nota"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1659,215 +1655,208 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<pakkaskrá>+"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<pakkaskrá>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "setja inn pakka"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr "ekki yfirfara MD5 undirritun skráa"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "ekki skoða pakkaskilyrðin"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "ekki skoða pakkaskilyrðin"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "ekki skoða pakkaskilyrðin"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<gömul>=<ný>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "uppfæra pakka"
 
@@ -1898,8 +1887,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "fyrirspurn/yfirferð á pakkann sam á skrá"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr ""
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "fyrirspurn/yfirferð á pakkann sam á skrá"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -1948,121 +1938,113 @@ msgstr "fyrirspurn/yfirferð á pakkana sem hafa pakkaþarfir"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "fyrirspurn/yfirferð á pakkana sem uppfylla þarfir annara pakka"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr "ekki yfirfara MD5 undirritun skráa"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "ekki yfirfara stærð skráa"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "ekki yfirfara symlink slóð skráa"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "ekki yfirfara eiganda skráa"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "ekki yfirfara hop skráa"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "ekki yfirfara heimildir skráa"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "ekki yfirfara skrárnar í pakkanum"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "ekki skoða pakkaskilyrðin"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ekki yfirfara SHA1 undirritunina"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ekki yfirfara MD5 undirritun skráa"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "búa til undirskrift"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "búa til undirskrift"
 
@@ -2400,36 +2382,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "get ekki opnað pakka gagnagrunn í\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d færa %s -> %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d færa %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "lína %d: %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "%5d færa %s -> %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%5d færa %s -> %s\n"
@@ -2882,13 +2864,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2901,7 +2883,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2914,7 +2896,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:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2922,21 +2904,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3511,62 +3493,52 @@ msgstr "gat ekki búið til %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ekki skoða pakkaskilyrðin"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "ekki skoða pakkaskilyrðin"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "ekki skoða pakkaskilyrðin"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Fseek brást: %s\n"
@@ -3576,6 +3548,14 @@ msgstr "%s: Fseek brást: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s rmdir %s brást: %s\n"
 
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "ekki skoða pakkaskilyrðin"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "ekki skoða pakkaskilyrðin"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "skilgreina fjölva <nafn> með gildinu <gildi>"