Update translations to pick up recent changes

26 files changed, 7645 insertions, 6813 deletions

diff --git a/po/ca.po b/po/ca.po
index 86972633b..f6d629bd6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2009-04-25 17:36+0100\n"
 "Last-Translator: Agustí Grau <fedora@softcatala.org>\n"
 "Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -36,7 +36,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "Versió de l'RPM %s\n"
@@ -79,147 +79,148 @@ msgstr "s'ha produït un error en llegir la capçalera del paquet\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "no s'ha pogut tornar a obrir les dades de càrrega: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "comprova paquets en el grup"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Opcions de consulta (amb -q o --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Opcions de verificació (amb -V o --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opcions d'instal·lació/actualització/supressió:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opcions comunes per a tots els modes d'rpm i executables:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "només es pot realitzar un tipus de consulta/verificació alhora"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "indicadors inesperats de la consulta"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "format inesperat de la consulta"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "font inesperada de la consulta"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "només es pot especificar un mode principal"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "només es poden forçar la instal·lació, l'actualització, l'rmsource i l'rmspec"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "només es poden reubicar els fitxers durant la instal·lació d'un paquet"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "no es pot utilitzar l'opció --prefix amb --relocate o --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "només es poden utilitzar les opcions --relocate i --excludepath quan "
 "s'estiguin instal·lant paquets nous"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 "només es pot utilitzar l'opció --prefix quan s'estiguin instal·lant paquets "
 "nous"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "els arguments a --prefix han de començar amb una /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --hash (-h) durant la instal·lació d'un "
 "paquet"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --percent durant la instal·lació d'un paquet"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --replacepkgs durant la instal·lació d'un "
 "paquet"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --excludedocs durant la instal·lació d'un "
 "paquet"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --includedocs durant la instal·lació d'un "
 "paquet"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "només es pot especificar una opció entre --excludedocs i --includedocs"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --ignorearch durant la instal·lació d'un "
 "paquet"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --ignoreos durant la instal·lació d'un "
 "paquet"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --ignoresize durant la instal·lació d'un "
 "paquet"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "només es pot especificar l'opció --allmatches durant la supressió d'un paquet"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "només es pot especificar l'opció --allfiles durant la instal·lació d'un "
 "paquet"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "només es pot especificar l'opció --justdb durant la instal·lació i supressió "
 "d'un paquet"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -227,7 +228,7 @@ msgstr ""
 "només es poden especificar les opcions d'inhabilitació d'scripts durant la "
 "instal·lació i supressió d'un paquet"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -235,48 +236,39 @@ msgstr ""
 "només es poden especificar les opcions d'inhabilitació de l'activador durant "
 "la instal·lació i supressió d'un paquet"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"només es pot especificar l'opció --nodeps durant el muntatge, la "
-"reconstrucció, la recompilació, la instal·lació, la supressió i la "
-"verificació d'un paquet"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "només es pot especificar l'opció --test durant la instal·lació, la supressió "
 "i el muntatge d'un paquet"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
-"només es pot especificar l'opció --root (-r) durant la instal·lació, "
-"supressió, consulta i reconstrucció d'una base de dades"
+"només es pot especificar l'opció --justdb durant la instal·lació i supressió "
+"d'un paquet"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "els arguments a --root (-r) han de començar per /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "no s'han donat paquets per a suprimir"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "no s'han donat paquets per a instal·lar"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "no s'han donat arguments per a consultar"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "no s'han donat arguments per a verificar"
 
@@ -422,7 +414,7 @@ msgstr "suprimeix el fitxer d'especificació en acabar"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "vés directament a l'etapa especificada (només per a c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "omet plataforma objectiu"
 
@@ -481,93 +473,128 @@ msgstr "S'estan muntant les plataformes destí: %s\n"
 msgid "Building for target %s\n"
 msgstr "S'està muntant per al destí %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "initialitza la base de dades"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "torna a muntar les llistes invertides de la base de dades des de les "
 "capçaleres de paquets instal·lades"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "verifica els fitxers de la base de dades"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Opcions de la base de dades:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "verifica la signatura dels paquets"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "importa una clau pública armada"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Opcions de la signatura:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "no s'han donat arguments"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "instal·la paquets"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signa els paquets (igual que --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "suprimeix les signatures dels paquets"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Opcions de la signatura:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "No es pot executar %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Heu d'establir «%%_gpg_name» al vostre fitxer de macros\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Introduïu la contrasenya:"
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "La contrasenya és correcta.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "La verificació de la contrasenya ha fallat\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "consulta un fitxer d'especificació"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "utilitza el format de consulta següent"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Opcions de la signatura:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "No s'ha pogut obrir el fitxer temporal.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Executant(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Ha fallat l'execució de %s (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "L'estat de sortida de %s (%s) és erroni\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -770,32 +797,32 @@ msgstr "No es permet el glob: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "El glob no ha trobat el fitxer: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "línia: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Fitxer no vàlid: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Propietari/grup incorrecte: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "S'està comprovant fitxers no empaquetats: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -804,12 +831,12 @@ msgstr ""
 "Hi ha fitxers instal·lats però no empaquetats:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "S'està processant els fitxers: %s-%s-%s.%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Els binaris dependents de l'arquitectura estan en el paquet noarch\n"
 
@@ -1028,30 +1055,30 @@ msgstr "manca el nom a %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "no hi ha descripció a %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "línia %d: s'ha produït un error en analitzar %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "línia %d: opció incorrecta %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "línia %d: massa noms: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "línia %d: no existeix Package: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "línia %d: segona descripció\n"
@@ -1136,97 +1163,97 @@ msgstr "No s'ha pogut llegir la icona %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "El tipus d'icona és desconegut: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "línia %d: l'etiqueta pren un únic testimoni: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "línia %d: caràcter «-» no permès a %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "línia %d: caràcter «-» no permès a %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "línia %d: caràcter «-» no permès a %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "línia %d: l'etiqueta és malament formada: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "línia %d: l'etiqueta és buida: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "línia %d: els prefixos no poden acabar en «/»: %s \n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "línia %d: «Docdir» ha de començar per «/»: %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "línia %d: el camp Epoch ha d'ésser un nombre sense signe: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "línia %d: %s és incorrecte: qualificadors: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "línia %d: el format de «BuildArchitecture» és incorrecte: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "linia %d: Només els subpaquets noarch estan suportats: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "S'ha produït un error intern: l'etiqueta %d és incorrecta\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "línia %d: es requereix la versió: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "L'especificació del paquet és incorrecta: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "El paquet ja existeix: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "línia %d: l'etiqueta és desconeguda: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} no pot estar buit\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} no pot ésser \"/\"\n"
@@ -1285,7 +1312,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "El número de pedaç %s no és vàlid: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "línia %d: segon %%prep\n"
@@ -1358,31 +1385,31 @@ msgstr "No es pot obrir %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "%%if sense tancar\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean retorna %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: s'ha obtingut un %%else sense %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: s'ha obtingut un %%endif sense %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "sentència %%include mal formada\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "No s'ha trobat cap arquitectura compatible per al muntatge\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "El paquet no té %%description: %s\n"
@@ -1429,27 +1456,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Hi ha hagut un error en analitzar %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Executant(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Manca %s a %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Massa arguments a la línia de dades a %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "S'està processant els fitxers: %s-%s-%s.%s\n"
@@ -1474,7 +1501,7 @@ msgstr "No s'ha pogut canviar al directori %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "No s'ha pogut executar %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "No s'ha pogut crear el procés fill de «%s»: %s\n"
@@ -1524,7 +1551,7 @@ msgstr "S'està cercant %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Ha fallat la cerca de %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1807,91 +1834,99 @@ msgstr "%s és un Delta RPM i no es pot instal·lar directament\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Les dades (%s) no estan disponibles al paquet %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "predefineix MACRO amb el valor EXPR"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "defineix la MACRO amb el valor EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "imprimeix l'expansió de la macro de l'EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "llegeix <FILE:...> en comptes dels fitxers per defecte"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FITXER:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "no verifiquis els resums dels fitxers"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "no verifiquis les capçaleres de la base de dades en obtenir-les"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "no verifiquis les signatures del paquet"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "envia de la sortida estàndard a CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "utilitza ROOT com a directori d'alt nivell"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "mostra etiquetes de consulta conegudes"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "mostra rpmrc final i la configuració de macros"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "proporciona sortides menys detallades"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "proporciona sortides més detallades"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "escriu la versió d'RPM que s'està usant"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "depura la màquina d'estats del fitxer de dades"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "depura l'E/S de l'rpmio"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: la taula d'opcions no està ben configurada (%d)\n"
@@ -1912,17 +1947,17 @@ msgstr "les reubicacions han de contenir ="
 msgid "relocations must have a / following the ="
 msgstr "les reubicacions han de tenir un / seguit de ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "afegeix els paquets suggerits a la transacció"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instal·la tots els fitxers, fins i tot configuracions que podrien ser "
 "ignorades"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1930,160 +1965,156 @@ msgstr ""
 "suprimeix tots els paquets que coincideixen amb <paquet> (normalment es "
 "genera un error si <paquet> especifica múltiples paquets)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "no executis els scriptlets del paquet"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "reubica els fitxers en un paquet no reubicable"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "escriu els bucles de dependències com a avís"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "suprimeix (desinstal·la) un paquet"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<paquet>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "no instal·lis fitxers de configuració"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "no instal·lis documentació"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "ignora fitxers amb un component inicial <camí> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<camí>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "detecta conflictes de fitxers entre paquets"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "abreviatura de --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "actualitza els paquets si ja estan instal·lats"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<fitxerPaquet>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "escriu marques durant la instal·lació de paquets (millor amb -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "no verifiquis l'arquitectura del paquet"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "no verifiquis el sistema operatiu del paquet"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "no comprovis l'espai en disc abans d'instal·lar"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "instal·la documentació"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "instal·la paquets"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "actualitza la base de dades, però no modifiquis el sistema de fitxers"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "no verifiquis les dependències dels paquets"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr "no verificar els resums dels fitxers"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr "no verificar els resums dels fitxers (obsolet)"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "no instal·lis els contexts de seguretat dels fitxers"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "no reordenis la instal·lació dels paquets per a satisfer les dependències"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "no suggereixis resolucions de dependències fallides"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "no executis cap scriptlet %%pre"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "no executis cap scriptlet %%post"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "no executis cap scriptlet %%preun"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "no executis cap scriptlet %%postun"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "no executis cap scriptlet invocat per aquest paquet"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "no executis cap scriptlet %%triggerprein"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "no executis cap scriptlet %%triggerin"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "no executis cap scriptlet %%triggerun"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "no executis cap scriptlet %%triggerpostun"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2091,39 +2122,39 @@ msgstr ""
 "actualitza a una versió antiga del paquet (--force ho fa automàticament en "
 "les actualitzacions)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "escriu els percentatges com a instal·lació de paquets"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "reubica el paquet a <dir>, si és reubicable"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "reubica els fitxers del camí <vell> al <nou>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<vell>=<nou>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "ignora els conflictes de fitxers entre paquets"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "reinstal·la si el paquet ja està present"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "no instal·lis, però digues si funcionarà correctament o no"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "actualitza paquets"
 
@@ -2213,10 +2244,6 @@ msgstr "mostra tots els fitxers del paquet"
 msgid "skip %%ghost files"
 msgstr "omet fitxers %%ghost"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "utilitza el format de consulta següent"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "mostra l'estat dels fitxers de la llista"
@@ -2841,31 +2868,31 @@ msgstr "contacteu amb %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "No s'ha pogut obrir %s per a lectura: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "no s'ha muntat la disponibilitat per a emprar scriptlets <lua>\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "No s'ha pogut crear el fitxer temporal per a %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "S'ha produït un error en duplicar el descriptor de fitxer: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "Ha fallat l'scriptlet %s, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s ha fallat l'scriplet, senyal %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "Ha fallat l'scriptlet %s,  estat de sortida %d\n"
@@ -2874,12 +2901,12 @@ msgstr "Ha fallat l'scriptlet %s,  estat de sortida %d\n"
 msgid "Unknown format"
 msgstr "Format desconegut"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(instalat) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2984,11 +3011,11 @@ msgstr "Verifiqueu la signatura: paràmetres dolents\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatura: desconeguda (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s ha fallat\n"
@@ -3063,148 +3090,138 @@ msgstr "s'esperava | al final de l'expressió"
 msgid "array iterator used with different sized arrays"
 msgstr "iterador de matrius emprat amb matrius de mides diferents"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d no disponible\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "no es pot obrir l'índex de %s emprant db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "no s'ha establert cap dbpath\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "s'ha produït un error (%d) en obtenir «%s» registres de l'índex %s\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: s'està ignorant"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "s'ha produït un error (%d) en emmagatzemar el registre #%d a %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: ha fallat regexec: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: ha fallat regcomp: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: s'està ignorant"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: s'ha obtingut la capçalera #%u malmesa -- s'està ignorant.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "s'ha produït un error (%d) en obtenir «%s» registres de l'índex %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr ""
 "error(%d) en establir el registre de la capçalera #%d per a la supressió de "
 "%s\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr ""
 "error(%d) en establir el registre de la capçalera #%d per a la supressió de "
 "%s\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: no s'ha pogut llegir la capçalera a 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "error(%d) en establir els registres «%s» de l'índex %s\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "error(%d) en emmagatzemar el registre «%s» en %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "error(%d) en suprimir el registre «%s» de %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "error(%d) en assignar la instància de nou paquet\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "error(%d) en emmagatzemar el registre %s a %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "no s'ha establert el dbpath"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "ja existeix la base de dades temporal %s\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "ha fallat en crear el directori %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "la capçalera #%u de la base de dades és incorrecta -- s'ignorarà.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "no es pot afegir el registre originalment a %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "no s'ha pogut remuntar la base de dades: es continua fent servir la base de "
 "dades original\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "no s'ha pogut reemplaçar la base de dades antiga amb la nova\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "reemplaçeu els fitxers a %s amb fitxers de %s per a recuperar-ho"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "no s'ha pogut suprimir el directori %s: %s\n"
@@ -3441,27 +3458,27 @@ msgstr "El fitxer %s fa menys de %u bytes\n"
 msgid "failed to create directory"
 msgstr "no s'ha pogut crear el directori"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "sintaxi invàlida en l'scriptlet lua: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "sintaxi invàlida en l'script lua: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "ha fallat l'script lua: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "sintaxi invàlida en el ftixer lua: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "Ha fallat el hook lua: %s\n"
@@ -3563,12 +3580,33 @@ msgstr "%s: ha fallat la lectura del manifest: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "no verifiquis la signatura de la capçalera i les dades"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "només es pot especificar l'opció --nodeps durant el muntatge, la "
+#~ "reconstrucció, la recompilació, la instal·lació, la supressió i la "
+#~ "verificació d'un paquet"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "només es pot especificar l'opció --root (-r) durant la instal·lació, "
+#~ "supressió, consulta i reconstrucció d'una base de dades"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "detecta conflictes de fitxers entre paquets"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d no disponible\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "ja existeix la base de dades temporal %s\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "comprova els paquets amb identificació de fitxer"
 
-#~ msgid "query a spec file"
-#~ msgstr "consulta un fitxer d'especificació"
-
 #~ msgid "<spec>"
 #~ msgstr "<fitxer d'especificació>"
 
@@ -3581,12 +3619,6 @@ msgstr "no verifiquis la signatura de la capçalera i les dades"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Sobreiximent del búfer objectiu\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Opcions de la signatura:"
-
-#~ msgid "Database options:"
-#~ msgstr "Opcions de la base de dades:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "cap fitxer per signar\n"
 
diff --git a/po/cs.po b/po/cs.po
index 325be8fc9..d55a604a0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Jindrich Novy <jnovy@users.sourceforge.net>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verze %s\n"
@@ -57,125 +57,126 @@ msgstr "chyba při při čtení hlavičky balíčku\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "nemohu znovu otevřít payload: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "dotaz/ověření balíčků ve skupině"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Volby dotazů (s -q nebo --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Vollby kontroly (s -V nebo --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Volby pro Instalaci/Aktualizaci/Mazání:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Společné volby pro všechny rpm režimy a spustitelné soubory:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 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:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "neočekávaný příznak pro dotaz"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "neočekávaný formát dotazu"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "neočekávaný zdroj dotazu"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "specifikovat lze jen jeden hlavní režim"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "vynucena může být jen instalace, aktualizace, smazání zdrojových kódů a spec "
 "souboru"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 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:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "nemohu použít --prefix s --relocate nebo --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 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:168
+#: rpmqv.c:164
 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:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametry pro --prefix musejí začínat znakem /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 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:178
+#: rpmqv.c:174
 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:182
+#: rpmqv.c:178
 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:186
+#: rpmqv.c:182
 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:190
+#: rpmqv.c:186
 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:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "použít lze jen jeden z parametrů --excludedocs a --includedocs"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 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:202
+#: rpmqv.c:198
 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:207
+#: rpmqv.c:203
 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:211
+#: rpmqv.c:207
 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:215
+#: rpmqv.c:211
 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:220
+#: rpmqv.c:216
 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:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -183,7 +184,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:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -191,45 +192,35 @@ msgstr ""
 "volba pro potlačení triggerů může být použita jen při instalaci nebo "
 "odstraňování balíčků"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps může být použit jen při sestavování, rekompilaci, instalaci, "
-"odstraňování a kontrole"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr "--test může být použit jen při instalaci, odstraňování a sestavování"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) může být použit jen při instalaci, odstraňování, dotazech nebo "
-"znovuvytvoření databáze"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test 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:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametry pro --root (-r) musejí začínat znakem /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "nezadány žádné balíčky pro vymazání"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "nezadány žádné balíčky pro instalaci"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "k dotazu nezadány žádné parametry"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezadány žádné balíčky"
 
@@ -371,7 +362,7 @@ msgstr "po dokončení odstranit spec soubor"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "přeskočit přímo na určenou etapu (pouze pro c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "cílová platforma předefinována"
 
@@ -429,91 +420,126 @@ msgstr "Sestavuji cílové platformy: %s\n"
 msgid "Building for target %s\n"
 msgstr "Sestavuji pro cíl %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "inicializuj databázi"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "znovu sestav obrácené seznamy z instalovaných hlaviček balíčků"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "zkontrolovat databázové soubory"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Volby databáze:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "ověřit podpis v balíčku"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "importuj obrněný veřejný klíč"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Volby signatury:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "nezadány žádné parametry"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "nainstalovat balíčky"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podepsat balíček (identické s --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "vymazat podpisy balíčku"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Volby signatury:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Je nutné nastavit \"%%_gpg_name\" ve vašem souboru maker\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Vložte heslovou frázi: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Heslová fráze je v pořádku.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Chybná heslová fráze\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "dotaz na spec soubor"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "použij následující formát dotazů"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Volby signatury:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Nelze otevřít dočasný soubor.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Provádění(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Spuštění %s selhalo (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Špatný návratový kód z %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -716,32 +742,32 @@ msgstr "Glob není dovolen: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Soubor nenalezen globem: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Nemohu otevřít %%files soubor %s: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "řádek: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Špatný soubor: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Špatný vlastník/skupina: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Kontroluji nezabalené soubory: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -750,12 +776,12 @@ msgstr ""
 "Nalezeny instalované, ale nezabalené soubory:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Zpracovávám soubory: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -974,30 +1000,30 @@ msgstr "chybějící jméno v %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "žádný popis v %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "řádek %d: Chyba při parsování %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "řádek %d: špatná volba %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "řádek %d: Příliš mnoho jmen: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "řádek %d: Balíček neexistuje: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "řádek %d: Druhé description\n"
@@ -1082,97 +1108,97 @@ msgstr "Nemohu přečíst ikonu %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Neznámý typ ikony: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, 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:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "řádek %d: Nepřípustný znak '-' v %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "řádek %d: Nepřípustný znak '-' v %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "řádek %d: Nepřípustný znak '-' v %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "řádek %d: Počkozená značka: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "řádek %d: Prázdná značka: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, 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:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "řádek %d: Docdir musí začínat na '/': %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "řádek %d: Položka Epoch musí být číslo: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "řádek %d: Špatné určení %s: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "řádek %d: Špatný formát BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Interní chyba: Špatná značka: %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "řádek %d: Vyžadována verze: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Špatná specifikace balíčku: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Balíček již existuje: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "řádek %d: Neznámá značka: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot nemůže být prázdný\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot nemůže být \"/\"\n"
@@ -1233,7 +1259,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Neplatné číslo záplaty %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "řádek %d: druhý %%prep\n"
@@ -1306,31 +1332,31 @@ msgstr "Nemohu otevřít %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Neuzavřený %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean vrátil %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, 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:368
+#: build/parseSpec.c:359
 #, 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:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "poškozený příkaz %%include\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Nenalezeny žádné kompatibilní architektury pro sestavení\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Balíček nemá žádné %%description: %s\n"
@@ -1377,27 +1403,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Chyba při parsování %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Provádění(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Chybějící %s v %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Příliš mnoho argumentů na datovém řádku na %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Zpracovávám soubory: %s-%s-%s\n"
@@ -1422,7 +1448,7 @@ msgstr "Nemohu změnit adresář na %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nemohu provést fork %s: %s\n"
@@ -1472,7 +1498,7 @@ msgstr "Hledám   %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Selhalo vyhledání %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
@@ -1749,91 +1775,99 @@ msgstr "%s is a Delta RPM a nemůže být přímo instalován\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nepodporovaný payload (%s) in balíčku %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "předefinuj <makro> s hodnotou <výraz>"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'<makro> <výraz>'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "definuj <makro> s hodnotou <výraz>"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "vypsat expanzi makra <výraz>"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'<výraz>'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "číst <soubor:...> místo implicitního souboru"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<SOUBOR:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "nekontrolovat souhrny balíčku"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "nekontrolovat získané hlavičky databáze"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "nekontrolovat podpisy balíčku"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "odeslat stdout do <příkazu>"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "<příkaz>"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "použít <adr> jako adresář nejvyšší úrovně"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "<adr>"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "zobrazit známé značky pro dotazy"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "zobrazit finální konfiguraci rpmrc a maker"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "poskytnout výstu s méně detaily"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "poskytnout detailnější výstup"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "vypsat používanou verzi rpm"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "ladit nástroj stavu souboru payload"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "ladit rpmio I/O"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabulka voleb špatně nakonfigurována (%d)\n"
@@ -1854,16 +1888,16 @@ msgstr "přemístění musejí obsahovat ="
 msgid "relocations must have a / following the ="
 msgstr "přemístění musejí mít za znakem = znak /"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "přidej doporučené balíčky do transakce"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1871,161 +1905,157 @@ 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:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "nespouštět žádné skripty určené pro balíčky"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "přemístění souborů v nepřemístitelném balíčku"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "zobraz závislostní smyčky jako varování"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "smazat (deinstalovat) balíček"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<balíček>"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "neinstaluj konfigurační soubory"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "neinstalovat dokumentaci"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "přeskočit soubory s úvodní cestou <cesta> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<cesta>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "detekuj konflikty souborů mezi balíčky"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "zkratka pro --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "aktualizace balíčku jestliže je již nainstalován"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<soubor_balíčku>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 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:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "nekontrolovat architekturu balíčku"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "nekontrolovat operační systém balíčku"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "nekontrolovat volné místo na disku před instalací"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "nainstalovat dokumentaci"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "nainstalovat balíčky"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "upravit databázi, ale neupravovat systém souborovů"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "nekontrolovat závislosti balíčků"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "nekontrolovat MD5 souborů v balíčku"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "nekontrolovat MD5 souborů v balíčku"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "neinstalovat bezpečnostní kontexty souboru"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 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:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "nedoporučovat chybějící rešení závislosti"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 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:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nespouštět žádné skripty určené pro balíčky"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2033,39 +2063,39 @@ msgstr ""
 "aktualizovat na starou verzi balíčku (--force to dělá při aktualizacích "
 "automaticky)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "během instalace balíčku zobrazit procenta"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "přemístit soubory do <adr>, jsou-li přemístitelné"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<adresář>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "přemístit soubory ze <staré_cesty> do <nové_cesty>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<stará_cesta>=<nová_cesta>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "ignoruj souborové konflikty mezi balíčky"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "přeinstalovat, i když je již balíček přítomen"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "aktualizace balíčku"
 
@@ -2154,10 +2184,6 @@ msgstr "vypsat soubory v balíčku"
 msgid "skip %%ghost files"
 msgstr "vynechat %%ghost soubory"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "použij následující formát dotazů"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "zobrazit stav vypsaných souborů"
@@ -2768,31 +2794,31 @@ msgstr "Prosím kontaktujte %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Nemohu otevřít %s pro čtení: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Nemohu vytvořit rouru pro %s: %m\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Nemohu vytvořit rouru pro %s: %m\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s scriptlet selhal, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s skriplet selhal, signál %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "provedení %s skripletu selhalo, návratový kód: %d\n"
@@ -2802,12 +2828,12 @@ msgstr "provedení %s skripletu selhalo, návratový kód: %d\n"
 msgid "Unknown format"
 msgstr "Neznámý"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(instalován) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2909,11 +2935,11 @@ msgstr "Skontrolujte podpis: ŠPATNÉ PARAMETRY\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpis: NEZNÁMÝ (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s selhalo\n"
@@ -2988,142 +3014,132 @@ msgstr "na konci výrazu je očekáváno |"
 msgid "array iterator used with different sized arrays"
 msgstr "iterátor pole použitý s poli jiné délky"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d není dostupné\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nemohu otevřít %s index pomocí db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "nebyla nastavena dbpath\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "chyba(%d) získávání \"%s\" záznamů z %s indexu\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: přeskakuji"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "chyba(%d) ukládání záznamu #%d do %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec selhal: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp selhal: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: přeskakuji"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: poškozená hlavička #%u získáno -- přeskakuji.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "chyba(%d) získávání \"%s\" záznamů z %s indexu\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "chyba(%d) při nastavování hlavičky #%d záznamu pro %s odstranění\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "chyba(%d) při nastavování hlavičky #%d záznamu pro %s odstranění\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: nemohu číst hlavičku na 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "chyba(%d) nastavování \"%s\" záznamů z %s indexu\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "chyba(%d) při ukládání záznamu \"%s\" do %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "chyba(%d) v odstraňování \"%s\" z %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba(%d) při alokaci nové instance balíčku\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "chyba(%d) při ukládání záznamu %s do %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "žádný dbpath nebyl nastaven"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "dočasná databáze %s již existuje\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "selhání při vytváření adresáře %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "hlavička #%u v databázi je špatná -- přeskakuji.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nemohu přidat záznam původně na %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "selhalo znovusestavení databáze: původní databáze zůstává na místě\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "selhalo nahrazení staré databáze novou databází!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahraď soubory v %s soubory z %s k obnovení"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "selhalo odstranění adresáře %s: %s\n"
@@ -3358,27 +3374,27 @@ msgstr ""
 msgid "failed to create directory"
 msgstr "selhání při vytváření adresáře %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "neplatná syntax v lua skriptletu: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "neplatná syntax v lua skriptu: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua skript selhal: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "neplatné syntax v lua souboru: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua obsloužení selhalo: %s\n"
@@ -3480,12 +3496,32 @@ msgstr "%s: čtení seznamu selhalo: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "neověřuj podpis hlavičky a payloadu"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps může být použit jen při sestavování, rekompilaci, instalaci, "
+#~ "odstraňování a kontrole"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) může být použit jen při instalaci, odstraňování, dotazech "
+#~ "nebo znovuvytvoření databáze"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "detekuj konflikty souborů mezi balíčky"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d není dostupné\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "dočasná databáze %s již existuje\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "dotaz/ověření balíčků se souborovým identifikátorem"
 
-#~ msgid "query a spec file"
-#~ msgstr "dotaz na spec soubor"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3498,12 +3534,6 @@ msgstr "neověřuj podpis hlavičky a payloadu"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Přetečení cílového bufferu\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Volby signatury:"
-
-#~ msgid "Database options:"
-#~ msgstr "Volby databáze:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "žádné soubory k podepsání\n"
 
diff --git a/po/da.po b/po/da.po
index 5debcd3bd..d22ec0b7a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
@@ -58,176 +58,167 @@ msgstr "fejl ved l�sning af hovedet p� pakke\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kan ikke gen�bne pakkeindhold: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "foresp�rg/verific�r pakke(r) i gruppen"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Foresp�rgselstilvalg (med -q eller --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Verifikationstilvalg (med -V eller --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "F�lles tilvalg for alle rpm-tilstande:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 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:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "uventet foresp�rgselsflag"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "uventet foresp�rgselsformat"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "uventet foresp�rgselskilde"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "kun �t hovedtilvalg kan angives"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omrokeres under installation"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 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:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun bruges, n�r nye pakker installeres"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametre til --prefix skal starte med et /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun angives ved installation"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun angives ved installation"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan kun angives ved installation"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan kun angives ved installation"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan kun angives ved installation"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "kun �n af --excludedocs og --includedocs kan angives"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan kun angives ved installation"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan kun angives ved installation"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan kun angives ved installation"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan kun angives ved installation"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan kun angives ved installation"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 #, 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:230
+#: rpmqv.c:226
 #, 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:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps kan kun angives ved opbygning, genopbygning, genovers�ttelse, "
-"installation, sletning og verifikation"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr "--test kan kun angives ved installation, sletning og opbygning"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) kan kun angives ved installation, sletning, foresp�rgsel og "
-"genopbygning af databasen"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parameteren til --root (-r) skal starte med et /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "ingen parametre angivet ved foresp�rgsel"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "ingen parametre angivet ved verifikation"
 
@@ -369,7 +360,7 @@ msgstr "fjern spec-fil ved afslutning"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "spring direkte til angivet stadium (kun for c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "gennemtving m�lplatform"
 
@@ -427,96 +418,131 @@ msgstr "Opbygger m�l-platforme: %s\n"
 msgid "Building for target %s\n"
 msgstr "Opbygger for m�l %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "initialis�r database"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "genopbyg omvendte databaselister ud fra installerede pakkehoveder"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 #, fuzzy
 msgid "verify database files"
 msgstr "foresp�rg en spec-fil"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Databasetilvalg:"
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verific�r pakkesignatur"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Signaturtilvalg"
+
+#: rpmkeys.c:61 rpmsign.c:143
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved foresp�rgsel"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "install�r pakke"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "underskriv en pakke (slet nuv�rende signatur)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "verific�r pakkesignatur"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Signaturtilvalg"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke udf�re %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Indtast adgangskode: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Adgangskode godkendt.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Adgangskode ikke godkendt\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "foresp�rg en spec-fil"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "brug f�lgende foresp�rgselsformat"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Signaturtilvalg"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke �bne midlertidig fil.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Udf�rer(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Udf�relse af %s mislykkedes (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Fejl-afslutningsstatus fra %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -719,44 +745,44 @@ msgstr "linie %d: Filnavn ikke tilladt: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Fil ikke fundet med glob: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Kunne ikke �bne '%%files'-fil %s: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "linie: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig ejer/gruppe: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Genneml�ber filer: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -980,30 +1006,30 @@ msgstr "navn mangler i %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "ingen beskrivelse i %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linie %d: Fejl ved tolkning af %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linie %d: Ugyldigt tilvalg %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "line %d: For mange navne: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "line %d: Pakken eksisterer ikke: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "linie %d: Anden beskrivelse\n"
@@ -1088,97 +1114,97 @@ msgstr "Kunne ikke l�se ikon %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Ukendt ikontype: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "linie %d: Ugyldigt tilvalg %s: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "linie %d: Ugyldigt tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "linie %d: Ugyldigt tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "linie %d: Ugyldigt tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linie %d: Forkert udformet m�rke: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linie %d: Tomt m�rke: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, 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:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linie %d: Docdir skal starte med '/': %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "linie %d: Epoch/Serial-felter skal v�re et nummer: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linie %d: Ugyldig %s: angivere: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linie %d: Ugyldigt 'BuildArchitecture'-format: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern fejl: Falsk m�rke %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "linie %d: Version kr�ves %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ugyldig pakkeangivelse: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakken eksisterer allerede: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linie %d: Ukendt m�rke: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot kan ikke v�re \"/\": %s\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot kan ikke v�re \"/\": %s\n"
@@ -1238,7 +1264,7 @@ msgstr "fil %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linie %d: anden %%prep\n"
@@ -1313,32 +1339,32 @@ msgstr ""
 msgid "Unclosed %%if\n"
 msgstr "Ikke-lukket %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerer %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, 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:368
+#: build/parseSpec.c:359
 #, 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:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "forkert udf�rt '%%include'-kommando\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen arkitekturer, der kan opbygges\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakke har ingen %%description: %s\n"
@@ -1385,27 +1411,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Fejl ved tolking af %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Udf�rer(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Manglende '(' i %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "For mange parametre p� datalinie ved %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Genneml�ber filer: %s-%s-%s\n"
@@ -1430,7 +1456,7 @@ msgstr "Kunne ikke udf�re %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunne ikke udf�re %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Kunne ikke fraspalte ny proces til %s: %s\n"
@@ -1480,7 +1506,7 @@ msgstr "Finder %s: (benytter %s)...\n"
 msgid "Failed to find %s:\n"
 msgstr "Kunne ikke finde %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "foresp�rgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
@@ -1760,98 +1786,106 @@ msgstr "%s kunne ikke installeres\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "udl�s makroudvidelse af <udtryk>+"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "l�s <fil:...> i stedet for standard makrofil(er)"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "undlad at tjekke pakkers afh�ngighedskrav"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "tjek ikke pakkens arkitektur"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verific�r pakkesignatur"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "send standard-ud til <kmd>"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "brug <katalog> som topniveau-katalog"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "vis kendte foresp�rgselsm�rker"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "vis den endelige rpmrc og makrokonfiguration"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "medtag mindre detaljerede oplysninger"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "medtag mere detaljerede oplysninger"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "vis versionen af rpm som benyttes"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "aflus rpmio I/O"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1872,18 +1906,18 @@ msgstr "omrokeringer skal indeholde et ="
 msgid "relocations must have a / following the ="
 msgstr "i omrokeringer skal = efterf�lges af /"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "foresp�rg/verific�r pakke(r) i gruppen"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1891,171 +1925,166 @@ msgstr ""
 "fjern alle pakker, som passer med <pakke> (normalt ville det medf�re en "
 "fejl, hvis <pakke> angav flere pakker)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "udf�r ingen pakkespecifikke skripter"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "omdirig�r filer i ikke-omdirig�rbar pakke"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "slet (afinstall�r) pakke"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 #, fuzzy
 msgid "<package>+"
 msgstr "<pakke>"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "vis alle konfigurationsfiler"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "install�r ikke dokumentation"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "overspring filer med foranstillet komponent <sti> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr ""
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "omdirig�r filer i ikke-omdirig�rbar pakke"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "forkortelse for --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "opgrad�r pakke, hvis den allerede er installeret"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<pakkefil>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 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:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "tjek ikke pakkens arkitektur"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "tjek ikke pakkens operativsystem"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "tjek ikke om der er diskplads, f�r der installeres"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "install�r dokumentation"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "install�r pakke"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "opdat�r databasen, men r�r ikke filsystemet"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "undlad at tjekke pakkers afh�ngighedskrav"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "verific�r ikke filerne i pakke"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "verific�r ikke filerne i pakke"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "vis alle konfigurationsfiler"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "�ndr ikke pakkernes installationsr�kkef�lge for at opfylde afh�ngigheder"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "udf�r ikke eventuelle skripter"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "udf�r ikke eventuelle skripter"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "udf�r ikke eventuelle skripter"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "udf�r ikke eventuelle skripter"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 #, 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:225
+#: lib/poptI.c:223
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "udf�r ingen pakkespecifikke skripter"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "udf�r ingen installations-sm�skripter"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "udf�r ingen installations-sm�skripter"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "udf�r ingen installations-sm�skripter"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2063,41 +2092,41 @@ msgstr ""
 "opgrad�r til en �ldre version af pakken (--force g�r ikke dette automatisk "
 "ved opgraderinger)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "vis procenter efterh�nden som pakken installeres"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "omdirig�r pakken til <katalog>, hvis omdirig�rbar"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<katalog>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "omdirig�r filer fra <gammelsti> til <nysti>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "<gammelsti>=<nysti>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "geninstall�r hvis pakken allerede er installeret"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "opgrad�r pakke"
@@ -2194,10 +2223,6 @@ msgstr "vis liste over filerne i pakken"
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "brug f�lgende foresp�rgselsformat"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "vis filernes status"
@@ -2825,32 +2850,32 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Kunne ikke �bne %s for l�sning: %s.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Kunne ikke fraspalte ny proces til %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Kunne ikke fraspalte ny proces til %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "overspringer installation af %s-%s-%s, %%pre-sm�skript fejlede rc %d\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr ""
 "k�rsel af sm�skriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr ""
@@ -2861,12 +2886,12 @@ msgstr ""
 msgid "Unknown format"
 msgstr "ukendt m�rke"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "ej installeret"
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2968,11 +2993,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s mislykkedes\n"
@@ -3047,142 +3072,132 @@ msgstr "| forventet ved slutningen af udtryk"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, 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"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "der er ikke sat nogen dbpath\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: �bning mislykkedes: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan ikke l�se hoved ved 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, 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"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "der ikke sat nogen dbpath"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "den midlertidige database %s eksisterer allerede\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "post nummer %d i databasen er fejlbeh�ftet -- overspringer.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kunne ikke tilf�je posten, der tidligere var ved %d\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "kunne ikke erstatte gammel database med ny database!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, 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"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
@@ -3417,27 +3432,27 @@ msgstr "Filen %s er mindre end %u byte\n"
 msgid "failed to create directory"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "- underst�ttes ikke for strenge\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- underst�ttes ikke for strenge\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite mislykkedes: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
@@ -3541,13 +3556,31 @@ msgstr "%s: l�s manifest mislykkedes: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verific�r pakkesignatur"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps kan kun angives ved opbygning, genopbygning, genovers�ttelse, "
+#~ "installation, sletning og verifikation"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) kan kun angives ved installation, sletning, foresp�rgsel og "
+#~ "genopbygning af databasen"
+
+#, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "omdirig�r filer i ikke-omdirig�rbar pakke"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "den midlertidige database %s eksisterer allerede\n"
+
 #, fuzzy
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "foresp�rg/verific�r pakke(r), der ejer filen"
 
-#~ msgid "query a spec file"
-#~ msgstr "foresp�rg en spec-fil"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3557,12 +3590,6 @@ msgstr "verific�r pakkesignatur"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Overl�b i m�lbuffer\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Signaturtilvalg"
-
-#~ msgid "Database options:"
-#~ msgstr "Databasetilvalg:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "ingen filer at underskrive\n"
 
diff --git a/po/de.po b/po/de.po
index 163c17f36..9040470e0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.4.2\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2009-01-11 01:27+0100\n"
 "Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
 "Language-Team: German <fedora-trans-de@redhat.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM-Version %s\n"
@@ -68,131 +68,132 @@ msgstr "Fehler beim Lesen des Paket-Headers\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "Kann Nutzdaten nicht erneut öffnen: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr "Abfragen/überprüfen der Paketauswahl:"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Abfrage-Optionen (mit -q oder --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Überprüfungsoptionen (mit -V oder --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Installations-/Aktualisierungs-/Deinstallationsoptionen:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Gemeinsame Optionen für alle RPM-Modi und Ausführungen:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 "Nur eine Art von Abfragen/Überprüfungen kann jeweils durchgeführt werden"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "Unerwartete Abfrage-Parameter"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "Unerwartetes Abfrage-Format"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "Unerwartete Abfrage-Quelle"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "Nur ein wichtiger Modus kann angegeben werden"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "Nur Installation, Aktualisierung, \"rmsource\" und \"rmspec\" können "
 "erzwungen werden"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "Dateien können nur bei der Paket-Installation verschoben werden"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 "--prefix kann nicht zusammen mit --relocate oder --excludepath verwendet "
 "werden"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate und --excludepath dürfen nur bei der Installation neuer Pakete "
 "benutzt werden"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "Argumente für --prefix müssen mit einem / beginnen"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "entweder --excludedocs oder --includedocs darf angegeben werden"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches darf nur während der Paket-Deinstallation angegeben werden"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles darf nur während der Paket-Installation angegeben werden"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb darf nur während der Paket-Installation oder -Deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -200,7 +201,7 @@ msgstr ""
 "Optionen zum Deaktivieren von Skripten können nur während der Paket-"
 "Installation oder -Deinstallation angegeben werden"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -208,47 +209,39 @@ msgstr ""
 "Optionen zum Deaktivieren von Trigger können nur während der Paket-"
 "Installation oder -Deinstallation angegeben werden"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps darf nur während der Paket-Installation, -Deinstallation, -"
-"Überprüfung und -Erstellung angegeben werden"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test darf nur während der Paket-Installation, -Deinstallation und -"
 "Erstellung angegeben werden"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
-"--root (-r) darf nur während der Paket-Installation, -Deinstallation, -"
-"Abfragen und während Datenbank-Neuerstellungen angegeben werden"
+"--justdb darf nur während der Paket-Installation oder -Deinstallation "
+"angegeben werden"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "Argumente für --root (-r) müssen mit einem / beginnen"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente für die Abfrage angegeben"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
 
@@ -396,7 +389,7 @@ msgstr "Spec-Datei nach Beendigung löschen"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "Springe direkt zur angegeben Phase (nur für c, i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "Überschreibe Zielplattform"
 
@@ -454,92 +447,127 @@ msgstr "Baue für die Zielplattform(en): %s\n"
 msgid "Building for target %s\n"
 msgstr "Baue für das Ziel %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "Initialisiere Datenbank"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "Erstelle invertierte Datenbank-Liste anhand der installierten Paket-Header"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "Überprüfe Datenbank-Dateien"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Datenbank-Optionen:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "Überprüfe Paket-Signatur(en)"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "Importiere einen gepanzerten öffentlichen Schlüssel"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Signatur-Optionen:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "Es wurden keine Argumente angegeben"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "Installiere Paket(e)"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "Signiere Paket(e) (identisch mit --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "Lösche Paket-Signatur(en)"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Signatur-Optionen:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Konnte %s nicht ausführen: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "\"%%_gpg_name\" muss in der Makro-Datei gesetzt sein\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Bitte das Passwort eingeben: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Das Passwort ist richtig.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Die Passwort-Überprüfung ist fehlgeschlagen\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "Abfragen einer Spec-Datei"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "Folgendes Abfrage-Format benutzen"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Signatur-Optionen:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Kann temporäre Datei nicht öffnen.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Ausführung(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Ausführung von %s fehlgeschlagen (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Fehler-Status beim Beenden von %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -742,32 +770,32 @@ msgstr "\"Glob\" hat keine Berechtigung für: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Datei von \"glob\" nicht gefunden: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Datei %s aus %%files konnte nicht geöffnet: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "Zeile: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ungültige Datei: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ungültiger Eigentümer/Gruppe: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Prüfe auf nicht gepackte Datei(en): %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -776,12 +804,12 @@ msgstr ""
 "Installierte (aber nicht gepackte) Datei(en) gefunden:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Verarbeite Pakete: %s-%s-%s.%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Architekturabhängige Binärdateien in noarch-Paket\n"
 
@@ -1000,30 +1028,30 @@ msgstr "Fehlender Name im %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "Keine Beschreibung im %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "Zeile %d: Fehler beim Parsen von %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "Zeile %d: Ungültige Option %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "Zeile %d: Zu viele Namen: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "Zeile: %d: Paket existiert nicht: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "Zeile %d: Zweite Beschreibung\n"
@@ -1108,98 +1136,98 @@ msgstr "Kann Icon %s nicht lesen: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Unbekannter Icon-Typ: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "Zeile %d: Tag benötigt nur ein Zeichen: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "Zeile %d: Ungültiges Zeichen '%c' in: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "Zeile %d: Ungültiges Zeichen in: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "Zeile %d: Ungültiges Zeichen \"..\" in: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "Zeile %d: Missgebildeter Tag: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "Zeile %d: Leerer Tag: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "Zeile %d: Präfixe dürfen nicht mit einem \"/\" enden: %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 "Zeile %d: Das Dokumentationsverzeichnis muss mit einem \"/\" beginnen: %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "Zeile %d: Das Epoch-Feld muss eine vorzeichenlose Zahl sein: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "Zeile %d: Ungültig %s: Kennzeichner: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "Zeile %d: Ungültiges BuildArchitecture-Format: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "Zeile %d: Nur noarch-Unterpakete werden unterstützt: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Interner Fehler: Falscher Tag %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "Zeile %d: %s ist veraltet: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ungültige Paket-Spezifikation: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket ist bereits vorhanden: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "Zeile %d: Unbekannter Tag: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} kann nicht leer sein\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} kann nicht \"/\" sein\n"
@@ -1258,7 +1286,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Ungültige Patch-Nummer %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "Zeile %d: Zweites %%prep\n"
@@ -1331,31 +1359,31 @@ msgstr "Öffnen von %s fehlgeschlagen: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Nicht geschlossenes %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean liefert %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else ohne %%if erhalten\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif ohne %%if erhalten\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "Missgebildete %%include-Anweisung\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Keine für das Bauen kompatible Architektur gefunden\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket hat keine %%description: %s\n"
@@ -1402,27 +1430,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Fehler beim Parsen von %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Ausführung(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Fehlendes %s bei %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Zu viele Argumente in der Datenzeile bei %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Verarbeite Pakete: %s-%s-%s.%s\n"
@@ -1447,7 +1475,7 @@ msgstr "Konnte nicht chdir zu %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Konnte %s nicht ausführen: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Konnte fork %s nicht ausführen: %s\n"
@@ -1497,7 +1525,7 @@ msgstr "Finde %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Fehlgeschlagenes zu finden %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "Abfragen der Spec-Datei %s fehlgeschlagen, kann nicht geparst werden\n"
@@ -1773,91 +1801,99 @@ msgstr "%s ist ein Delta RPM und kann nicht direkt installiert werden\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nicht unterstütze Nutzlast (%s) in Paket %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "MAKRO mit Wert AUSDRUCK vordefinieren"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MAKRO AUSDRUCK'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "MAKRO mit Wert AUSDRUCK definieren"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "Makro-Ausdehnung des AUSDRUCKS anzeigen"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'AUSDRUCK'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "lese <DATEI:...> anstatt der Standard-Datei(en)"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<DATEI:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "Paket-Kurzfassung nicht überprüfen"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "Datenbank-Header beim Abrufen nicht überprüfen"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "Paket-Signatur(en) nicht überprüfen"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "Sende Standardausgabe an CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "benutze WURZELVERZEICHNIS als oberstes Verzeichnis"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "WURZELVERZEICHNIS"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "Zeige bekannte Abfrage-Tags"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "Zeige endgültige rpmrc- und Makro-Konfiguration"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "Zeige weniger informative Ausgabe"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "Zeige detailliertere Ausgabe"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "Zeige benutzte RPM-Version"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "Debugge Nutzdaten-Dateistatus"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "Debugge rpmio Ein-/Ausgabe"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: Optionstabelle ist falsch konfiguriert (%d)\n"
@@ -1878,17 +1914,17 @@ msgstr "Verschiebungen müssen ein = enthalten"
 msgid "relocations must have a / following the ="
 msgstr "Verschiebungen müssen einen / nach dem = enthalten"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "Füge vorgeschlagene Pakete zur Transaktion hinzu"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "Installiere alle Dateien, sogar Konfigurationsdateien, die sonst "
 "möglicherweise übersprungen werden"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1896,160 +1932,156 @@ msgstr ""
 "Entferne alle Pakete, die mit <Paket> übereinstimmen (normalerweise wird "
 "eine Fehlermeldung angezeigt, wenn <Paket> auf mehrere Pakete zutrifft)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "Keine Paket-Scriptlets ausführen"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "Verschiebe Dateien eines nicht verschiebbaren Pakets"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "Zeige Abhängigkeitsschleifen als Warnung"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "Lösche (deinstalliere) Paket"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<Paket>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "Installiere keine Konfigurationsdateien"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "Installiere keine Dokumentation"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "Überspringe Dateien mit beginnendem <Pfad> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<Pfad>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "Erkenne Datei-Konflikte zwischen Paketen"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "Abkürzung für --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "Aktualisiere Paket(e), wenn bereits installiert"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<Paket-Datei>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Zeige Rautezeichen während der Installation (empfehlenswert mit -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "Keine Überprüfung der Paket-Architektur"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "Keine Überprüfung des Paket-Betriebssystems"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "Keine Überprüfung des Festplattenspeichers vor der Installation"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "Installiere Dokumentation"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "Installiere Paket(e)"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "Aktualisiere die Datenbank, aber verändere nichts im Dateisystem"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "Keine Überprüfung der Paket-Abhängigkeiten"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr "Keine Überprüfung der Prüfsumme der Dateien"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr "Keine Überprüfung der Prüfsumme der Dateien (veraltet)"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "Installiere keine Sicherheitskontext-Dateien"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "Paket-Installation nicht neu sortieren, um die Abhängigkeiten zu erfüllen"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "Keine Vorschläge für fehlende Abhängigkeitsauflösungen"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "%%pre-Scriptlet nicht ausführen (wenn vorhanden)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "%%post-Scriptlet nicht ausführen (wenn vorhanden)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "%%preun-Scriptlet nicht ausführen (wenn vorhanden)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "%%postun-Scriptlet nicht ausführen (wenn vorhanden)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "Keine Scriptlets dieses Pakets ausführen"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "%%triggerprein-Scriptlets nicht ausführen"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "%%triggerin-Scriptlets nicht ausführen"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "%%triggerun-Scriptlets nicht ausführen"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "%%triggerpostun-Scriptlets nicht ausführen"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2057,41 +2089,41 @@ msgstr ""
 "Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
 "Aktualisierungen automatisch)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "Zeige Prozentangabe bei der Paket-Installation"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis "
 "<Verzeichnis>"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<Verzeichnis>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "verschiebe Dateien von <alter Pfad> nach <neuer Pfad>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<alter Pfad>=<neuer Pfad>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "Ignoriere Datei-Konflikte zwischen Paketen"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "Installiere erneut, wenn das Paket bereits vorhanden ist"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "Paket(e) aktualisieren"
 
@@ -2180,10 +2212,6 @@ msgstr "Alle Dateien im Paket auflisten"
 msgid "skip %%ghost files"
 msgstr "Überspringe %%ghost-Dateien"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "Folgendes Abfrage-Format benutzen"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "Anzeigen der Zustände der aufgelisteten Dateien"
@@ -2806,31 +2834,31 @@ msgstr "Bitte (in Englisch) %s kontaktieren\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Kann %s nicht zum Lesen öffnen: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua>-Scriptlet-Unterstützung nicht eingebaut\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Konnte keine temporäre Datei erzeugen für %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Konnte Datei-Beschreiber nicht duplizieren: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s Scriptlet fehlgeschlagen, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s Scriptlet fehlgeschlagen, Signal %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s Scriptlet fehlgeschlagen, Beenden-Status %d\n"
@@ -2839,12 +2867,12 @@ msgstr "%s Scriptlet fehlgeschlagen, Beenden-Status %d\n"
 msgid "Unknown format"
 msgstr "Unbekanntes Format"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(installiert) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2946,11 +2974,11 @@ msgstr "Überprüfe Signatur: UNGÜLTIGE PARAMETER\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: UNBEKANNT (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s fehlgeschlagen\n"
@@ -3025,143 +3053,133 @@ msgstr "| am Ende des Ausdrucks erwartet"
 msgid "array iterator used with different sized arrays"
 msgstr "Zählvariable wird mit ungleich grossem Array benutzt"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d nicht verfügbar\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "Kann den %s-Index nicht öffnen, benutze db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "Kein Datenbank-Pfad wurde gesetzt\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "Fehler(%d) beim Lesen \"%s\"-Einträgen des %s-Indexes\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: Überspringe"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "Fehler(%d) beim Speichern des Eintrags #%d in %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec fehlgeschlagen: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp fehlgeschlagen: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: Überspringe"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: Beschädigten Header #%u erhalten -- überspringe.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "Fehler(%d) beim Lesen \"%s\"-Einträgen des %s-Indexes\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "Fehler(%d) beim Markieren des Header-Eintrags #%d zur %s Entfernung\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "Fehler(%d) beim Markieren des Header-Eintrags #%d zur %s Entfernung\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: Kann den Header bei 0x%x nicht lesen\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "Fehler(%d) beim Setzen von \"%s\"-Einträgen des %s-Indexes\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "Fehler(%d) beim Speichern des Eintrags \"%s\" in %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "Fehler(%d) beim Entfernen des Eintrags \"%s\" aus %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "Fehler(%d) beim Reservieren einer neuen Paket-Instanz\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "Fehler(%d) beim Speichern des Eintrags %s in %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "Kein Datenbank-Pfad wurde gesetzt"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "Temporäre Datenbank %s existiert bereits\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "Erzeugen des Verzeichnises %s fehlgeschlagen: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "Header #%u in der Datenbank ist ungültig -- überspringe.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "Kann ursprünglichen Eintrag %u nicht hinzufügen\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "Neu bauen der Datenbank fehlgeschlagen: Datenbank verbleibt entsprechend\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "Konnte die alte Datenbank nicht durch die neue ersetzen!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "Ersetze Dateien in %s mit Dateien aus %s für eine Wiederherstellung"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Entfernen des Verzeichnisses %s fehlgeschlagen: %s\n"
@@ -3395,27 +3413,27 @@ msgstr "Datei %s ist kleiner als %u Byte\n"
 msgid "failed to create directory"
 msgstr "Erzeugen des Verzeichnises fehlgeschlagen"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "Ungültige Syntax in lua-Scriptlet: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "Ungültige Syntax in lua-Script: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua-Script fehlgeschlagen: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "Ungültige Syntax in lua-Datei: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua hook fehlgeschlagen: %s\n"
@@ -3517,12 +3535,32 @@ msgstr "%s: Lesen der Paket-Liste fehlgeschlagen: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "Keine Überprüfung der Header- und Nutzdaten-Signatur"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps darf nur während der Paket-Installation, -Deinstallation, -"
+#~ "Überprüfung und -Erstellung angegeben werden"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) darf nur während der Paket-Installation, -Deinstallation, -"
+#~ "Abfragen und während Datenbank-Neuerstellungen angegeben werden"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "Erkenne Datei-Konflikte zwischen Paketen"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d nicht verfügbar\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "Temporäre Datenbank %s existiert bereits\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "Abfragen/überprüfen von Paketen mit Datei-Kennung"
 
-#~ msgid "query a spec file"
-#~ msgstr "Abfragen einer Spec-Datei"
-
 #~ msgid "<spec>"
 #~ msgstr "<Spec-Datei>"
 
@@ -3535,12 +3573,6 @@ msgstr "Keine Überprüfung der Header- und Nutzdaten-Signatur"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Überlauf des Zielpuffers\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Signatur-Optionen:"
-
-#~ msgid "Database options:"
-#~ msgstr "Datenbank-Optionen:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "Keine Dateien zu signieren\n"
 
diff --git a/po/es.po b/po/es.po
index 03c5a5582..a2ad425a3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm.rpm-4-7-x.rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2010-09-13 12:31-0300\n"
 "Last-Translator: Héctor Daniel Cabrera <logan@fedoraproject.org>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "versión RPM %s\n"
@@ -69,138 +69,139 @@ msgstr "error al leer encabezado del paquete\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "no se puede volver a abri la carga útil: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr "Opciones de la selección de paquetes a consultar/verificar:"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Opciones de consulta (con -q o --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Opciones de verificación (con -V o --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opciones de Instalación/Actualización/Remoción:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opciones comunes para todos los modos rpm y ejecutables:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "solo un tipo de consulta/verificación puede ser ejecutado a la vez"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "opciones de consulta inesperadas"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "formato de consulta inesperado"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "fuente de consulta inesperado"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "solo puede especificarse un modo principal"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "solo las opciones de instalación, actualización, rmsource y rmspec pueden "
 "ser forzadas"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr ""
 "los archivos solo pueden ser reubicados durante la instalación del paquete"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "no se puede utilizar --prefix con --relocate o --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate y --excludepath solo pueden ser utilizados cuando se instalan "
 "nuevos paquetes"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix solo puede ser utilizado al instalar nuevos paquetes"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "los argumentos de --prefix deber iniciar con una /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "--percent solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "solo se puede especificar una opción: --excludedocs o --includedocs"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--ignoreos solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--ignoresize solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches solo puede ser especificado durante la eliminación del paquete"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--allfiles solo puede ser especificado durante la instalación del paquete"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb solo puede ser especificado durante la instalación y eliminación "
 "del paquete"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -208,7 +209,7 @@ msgstr ""
 "las opciones para desactivar scripts sólo pueden ser especificadas durante "
 "la instalación y eliminación del paquete"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -216,48 +217,39 @@ msgstr ""
 "las opciones de desactivación de detonante sólo pueden ser especificadas "
 "durante la instalación y eliminación del paquete"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps sólo puede ser especificado durante la construcción, re-"
-"construcción, recompilación, instalación, eliminación y verificación del "
-"paquete"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test sólo puede ser especificado durante instalación, eliminación, y "
 "construcción del paquete"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
-"--root (-r) sólo puede ser especificado durante instalación, eliminación, "
-"consulta y re-construcción de la base de datos"
+"--justdb solo puede ser especificado durante la instalación y eliminación "
+"del paquete"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "los argumentos de --root (-r) deben iniciar con una /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "no ha sido indicado ningún paquete para ser eliminado"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "no ha sido indicado ningún paquete para la instalación"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "no ha sido indicado ningún argumento para la consulta"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "no ha sido indicado ningún argumento para la verificación"
 
@@ -405,7 +397,7 @@ msgstr "eliminar el archivo spec al finalizar"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "Ir a etapa especificada (solo para c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "sobreescribir plataforma de destino"
 
@@ -464,92 +456,127 @@ msgstr "Construyendo las plataformas de destino: %s\n"
 msgid "Building for target %s\n"
 msgstr "Construyendo para el destino %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "inicializar base de datos"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "reconstruir lista invertida de la base de datos desde los encabezados de "
 "paquetes instalados"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "verificar archivos de la base de datos"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Opciones de la base de datos:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "verificar firma(s) del paquete"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "importar una llave pública con armadura"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr "lista las llaves del administrador de llaves RPM"
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Opciones de firma:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "no ha sido indicado ningún argumento"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 msgid "sign package(s)"
 msgstr "firma paquete(s)"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "firmar paquete(s) (idéntico a --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "eliminar las firmas del paquete"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Opciones de firma:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "No se pudo ejecutar %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Debe establecer \"%%_gpg_name\" en su archivo de macro\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Introduzca la frase de acceso:"
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "La frase de acceso es correcta\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Falló la verificación de la frase de acceso\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "consultar un archivo spec"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "utilizar el siguiente formato de consulta"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Opciones de firma:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "No es posible abrir archivo temporal.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Ejecutando(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Falló exec sobre %s  (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Estado de salida erróneo de %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -753,32 +780,32 @@ msgstr "Glob no permitido: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Archivo no encontrado por glob: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "No se pudo abrir el archivo %%files %s: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "línea: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Archivo erróneo: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "propietario/grupo erróneo: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Comprobando si hay archivos desempaquetados: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -787,12 +814,12 @@ msgstr ""
 "Se encontraron archivos instalados (pero desempaquetados):\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Procesando archivos: %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 "Binarios dependientes de la arquitectura en paquetes sin arquitectura\n"
@@ -1013,30 +1040,30 @@ msgstr "nombre ausente en %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "ninguna descripción en %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "línea %d: Error al analizar %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "línea %d: Opción errónea %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "línea %d: Demasiados nombres: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "línea %d: El paquete no existe: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "línea %d: Segunda descripción\n"
@@ -1121,97 +1148,97 @@ msgstr "No ha sido posible leer el icono %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Tipo de icono desconocido: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "línea %d: La etiqueta solo recibe patrones individuales: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "línea %d: Carácter '%c' ilegal en: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "línea %d: Carácter ilegal en: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "línea %d: Secuencia \"..\" ilegal en: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "línea %d: Etiqueta mal formada: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "línea %d: Etiqueta vacía: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "línea %d: Los prefijos deben finalizar en \"/\": %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "línea %d: Docdir debe iniciar con '/': %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "línea %d: El campo epoch debe ser un número sin signo: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "línea %d: %s erróneo: calificadores: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "línea %d: Formato BuildArchitecture erróneo: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "linea %d: Solo existe soporte para subpaquetes sin arquitectura: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Error interno: Etiqueta errónea %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "línea %d: %s se encuentra obsoleta: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Especificación de paquete errónea: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "El paquete ya existe: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "línea %d: Etiqueta desconocida: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} no puede ser vacío\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{BuildRoot} no puede ser \"/\"\n"
@@ -1270,7 +1297,7 @@ msgstr "%s: %s %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Número de parche %s inválido: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "línea %d: segundo %%prep\n"
@@ -1343,31 +1370,31 @@ msgstr "No ha sido posible abrir %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Sin cerrar %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean retornó %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Tiene un %%else sin %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Tiene un %%endif sin %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "declaración %%include malformada\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "No se encontraron arquitecturas compatibles para la construcción\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "El paquete no tiene %%description: %s\n"
@@ -1417,27 +1444,27 @@ msgstr ""
 "El tipo '%s' ha sido ofrecido con otro tipos en %%semodule %s. Compactando "
 "tipos a '%s'.\n"
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Error analizando %s: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Se espera marca de %%semodule: %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "No se encuentra ruta de módulo en la línea: %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Demasiados argumentos en la línea: %s\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, c-format
 msgid "Processing policies: %s\n"
 msgstr "Procesando políticas: %s\n"
@@ -1462,7 +1489,7 @@ msgstr "No se pudo cambiar al directorio %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "No se pudo ejecutar la llamada exec %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "No se pudo ejecutar la llamada al sistema fork para %s: %s\n"
@@ -1511,7 +1538,7 @@ msgstr "Buscando %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Falló la búsqueda de %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "la consulta del archivo spec %s falló, no se pudo analizar\n"
@@ -1784,92 +1811,100 @@ msgstr "%s es un RPM Delta y no puede ser instalado directamente\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Carga útil (%s) no soportada en el paquete %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "predefine MACRO con valor EXPR"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "define MACRO con valor EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "imprimir expansión de macro de EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "leer <FILE:...> en vez del archivo(s) predeterminado"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "no verificar resumen del paquete(s)"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 "no verificar la base de datos de lo(s) encabezado(s) cuando sean recuperadas"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "no verificar la firma(s) del paquete"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "enviar stdout a CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "utilizar ROOT como el directorio superior"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "mostrar etiquetas de consulta conocidas"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "mostrar configuración rpmrc y macro final"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "proporcionar salida menos detallada"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "proporcionar salida más detallada"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "imprimir la versión de rpm que está siendo utilizada"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "depurar archivo de carga de la máquina de estado"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "depurar E/S rpmio"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: misconfiguración de la opción table (%d)\n"
@@ -1890,17 +1925,17 @@ msgstr "realocaciones deben contener un ="
 msgid "relocations must have a / following the ="
 msgstr "realocaciones deben tener una / después de ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "agregar los paquetes sugeridos a la transacción"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instalar todos los archivos, incluso los de configuración, que de otra "
 "manera serían salteados."
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1908,159 +1943,155 @@ msgstr ""
 "remueve todos los paquetes que coincidan con <paquetes> (normalmente un "
 "error es generado si <paquete> especifica multiples paquetes) "
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "no ejecutar scriptlet(s) del paquete"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "reubicar archivos en un paquete no reubicable"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "mostrar bucles de dependencias como advertencias"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "borrar (desinstalar) paquete"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<package>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "no instalar los archivos de configuración"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "no instalar documentación"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "omitir archivos con el componente inicial <path>"
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<path>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "detectar conflictos de archivos entre paquetes"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "abreviatura para --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "actualizar paquete(s) si ya están instalados"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<packagefile>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "imprimir marcas hash como durante la instalación del paquete (con -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "no verificar arquitectura del paquete"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "no verificar sistema operativo del paquete"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "no verificar espacio de disco antes de la instalación"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "instalar documentación"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "instalar paquete(s)"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "actualizar la base de datos, mas no modificar el sistema de archivos"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "no verificar las dependencias del paquete"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr "no verificar el digest de los archivos"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr "no verificar el digest de los archivos (obsoleto)"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "no instalar contextos de seguridad del archivo"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "no reordenar la instalación de paquetes para satisfacer dependencias"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "no sugerir resolución de dependencias ausentes"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "no ejecutar %%pre scriptlet (si hay)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "no ejecutar %%post scriptlet (si hay)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "no ejecutar %%preun scriptlet (si hay)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "no ejecutar %%postun scriptlet (si hay)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "no ejecutar ningún scriptlet detonado por este paquete"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "no ejecutar ningún %%triggerprein scriptlet(s)"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "no ejecutar ningún %%triggerin scriptlet(s)"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "no ejecutar ningún %%triggerun scriptlet(s)"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "no ejecutar ningún %%triggerpostun scriptlet(s)"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr "no realizar ninguna acción de colección"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2068,39 +2099,39 @@ msgstr ""
 "actualiza a una versión antigua del paquete (--force en actualizaciones hace "
 "esto automaticamente)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "imprimir porcentaje mientras se instala el paquete"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "realojar el paquete a <dir> si éste es realojable"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "realojar archivos de la ruta <old> a <new>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<old>=<new>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "ignorar conflictos entre paquetes referentes a archivos "
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "reinstalar si el paquete ya está presente"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "no instalar, pero señalar si se puede o no"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "actualizar paquete(s)"
 
@@ -2189,10 +2220,6 @@ msgstr "listar archivos del paquete"
 msgid "skip %%ghost files"
 msgstr "saltar archivos %%ghost"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "utilizar el siguiente formato de consulta"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "mostrar el estado de los archivos listados"
@@ -2817,32 +2844,32 @@ msgstr "Por favor contacte %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "No se puede abrir %s para lectura: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 "soporte interno para macro de inclución de guiones <lua>, no fue construido\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "No se pudo crear un archivo temporal para %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "No se pudo duplicar el descritor de archivo %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: macro de ejecución de guión fallido, waitpid(%d) rd %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s: macro de ejecución de guión fallido, señal %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s: macro de ejecución de guión fallido, estado de terminación %d\n"
@@ -2851,11 +2878,11 @@ msgstr "%s: macro de ejecución de guión fallido, estado de terminación %d\n"
 msgid "Unknown format"
 msgstr "formato desconocido"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 msgid "install"
 msgstr "instalar "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr "borrar"
 
@@ -2959,11 +2986,11 @@ msgstr "Verificar firma: PARÁMETROS ERRÓNEOS\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Firma: DESCONOCIDA (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr "ignorado"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "failed"
 msgstr "falló"
 
@@ -3037,145 +3064,135 @@ msgstr "se esperaba | al final de la expresión"
 msgid "array iterator used with different sized arrays"
 msgstr "iterador de arreglo usado con arreglos de diferente tamaño"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d no disponible\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "no se pudo abrir índice %s utilizando db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "no se ha establecido dbpath\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "error(%d) obteniendo registros \"%s\" del índice %s\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: omitiendo"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "error(%d) almacenando registro #%d en %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s:  regexec falló: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp falló: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: omitiendo"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: encabezado dañado #%u recuperada -- omitiendo.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "error(%d) obteniendo registros \"%s\" del índice %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "error(%d) estableciendo registro de encabezado #%d\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "error(%d) eliminando registro de encabezado #%d\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: no se pudo leer encabezado en 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "error(%d) estableciendo registros \"%s\" desde índice %s\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "error(%d) almacenando registros \"%s\" en %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "error(%d) eliminando registro \"%s\" de %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "error(%d) asignando nueva instancia de paquete\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "error(%d) almacenando registro %s en %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "no se ha establecido dbpath"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "la base de datos temporal %s ya existe\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "no se pudo crear el directorio %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "encabezado #%u erróneo en la base de datos -- omitiendo.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "no se puede añadir el registro original en %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "falló la reconstrucción de la base de datos: la base de datos original "
 "permanece en su lugar\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 "¡falló el remplazo de la base de datos antigua con la nueva base de datos!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "reemplazar archivos en %s con los archivos de %s a recuperar"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falló la eliminación del directorio %s: %s\n"
@@ -3415,27 +3432,27 @@ msgstr "El archivo %s tiene menos de %u bytes\n"
 msgid "failed to create directory"
 msgstr "falló al crear el directorio"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "sintaxis no válida en el macro de ejecución de scriptlet lua: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "sintaxis no valida en el scriptlet lua: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "falló el scriptlet lua: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "sintaxis no valida en el archivo de scriptlet lua: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "falló el enlace de lua: %s\n"
@@ -3536,12 +3553,33 @@ msgstr "%s: falló la lectura del manifiesto: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "no verificar firma de encabezado+carga"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps sólo puede ser especificado durante la construcción, re-"
+#~ "construcción, recompilación, instalación, eliminación y verificación del "
+#~ "paquete"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) sólo puede ser especificado durante instalación, eliminación, "
+#~ "consulta y re-construcción de la base de datos"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "detectar conflictos de archivos entre paquetes"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d no disponible\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "la base de datos temporal %s ya existe\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "consultar/verificar paquete(s) con archivo identificador "
 
-#~ msgid "query a spec file"
-#~ msgstr "consultar un archivo spec"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3554,12 +3592,6 @@ msgstr "no verificar firma de encabezado+carga"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Desborde del búfer de destino\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Opciones de firma:"
-
-#~ msgid "Database options:"
-#~ msgstr "Opciones de la base de datos:"
-
 #~ msgid "Internal error in argument processing (%d) :-(\n"
 #~ msgstr "Error interno en el procesamiento del argumento (%d) :-(\n"
 
diff --git a/po/fi.po b/po/fi.po
index b4039199c..c6afad9c3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm-4.4.90\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2008-03-11 11:15+0200\n"
 "Last-Translator: Panu Matilainen <pmatilai@redhat.com>\n"
 "Language-Team: Finnish\n"
@@ -16,7 +16,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versio %s\n"
@@ -57,124 +57,125 @@ msgstr "virhe luettaessa otsikkotietoa paketista\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kuorman uudelleenavaus ei onnistu: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr "Kysely/tarkistus pakettivalitsimet"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Kyselyvalitsimet (-q tai --query yhteydessä)"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Tarkistusvalitsimet (-V tai --verify yhteydessä)"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Asennus-, päivitys- ja poistovalitsimet:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Yhteiset valitsimet kaikille rpm moodeille:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "vain yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "odottamattomia kyselyvalintoja"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "odottamaton kyselyn muotoilu"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "vain yksi päätila voidaan määritellä"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr "vain asennus, päivitys, rmsource ja rmspec voidaan pakottaa"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "--prefix valintaa ei voi käyttää --relocate tai --excludepath kanssa"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate ja --excludepath: voidaan käyttää vain uusia paketteja "
 "asennettaessa"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix parametrien pitää alkaa /-merkillä"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -182,7 +183,7 @@ msgstr ""
 "skriptien estovalintoja voidaan käyttää vain paketteja asennettaessa tai "
 "poistettaessa"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -190,47 +191,38 @@ msgstr ""
 "laukaisimien estovalintoja voidaan käyttää vain paketteja asennettaessa tai "
 "poistettaessa"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
-"tarkistettaessa"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
 "käännettäessä"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
-"--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
-"kyseltäessä ja tietokannan uudelleenluonnissa"
+"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametrit --root (-r):lle alettava /-merkillä"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "poistolle ei määritelty paketteja"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrejä"
 
@@ -368,7 +360,7 @@ msgstr "poista määrittelytiedosto kun valmis"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "siirry suoraan määriteltyyn vaiheeseen (vain c ja i yhteydessä)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "ohita kohdealusta"
 
@@ -425,91 +417,126 @@ msgstr "Käännetään kohdealustoille: %s\n"
 msgid "Building for target %s\n"
 msgstr "Käännetään kohteelle %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "alusta tietokanta"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "rakenna tietokanta uudestaan asennettujen pakettien tiedoista"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "tarkista tietokanta"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Tietokantavalitsimet:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "tarkista paketin allekirjoitus"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Allekirjoitusvalitsimet:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "ei annettu parametrejä"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "asenna paketteja"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "poista paketin allekirjoitus"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Allekirjoitusvalitsimet:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s:ää ei voitu suorittaa: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"gpg_name:\" makrotiedostossasi\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Syötä salasana: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Salasana täsmää.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Salasanan tarkistus epäonnistui\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "kysele määrittelytiedostoa"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "käytä seuraava kyselyformaattia"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Allekirjoitusvalitsimet:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "En voi avata väliaikaistiedostoa.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Suoritetaan(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s:n suoritus epäonnistui (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -711,32 +738,32 @@ msgstr "Täydennys ei sallittu: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Tiedostoa ei löytynyt täydennyksellä: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "%%files tiedostoa %s ei voitu avata: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "rivi: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Virheellinen tiedosto: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Virheellinen omistaja/ryhmä: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Tarkistetaan paketoimattomia tiedostoja: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -745,12 +772,12 @@ msgstr ""
 "Löytyi asennettuja (mutta paketoimattomia) tiedostoja:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Käsitellään tiedostoja: %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -969,30 +996,30 @@ msgstr "puuttuva nimi %%changelog:issa\n"
 msgid "no description in %%changelog\n"
 msgstr "ei kuvausta %%changelog:issa\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "rivi %d: virhe jäsennettäessä %%description-osiota %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "rivi %d: virheellinen valinta %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "rivi %d: liikaa nimiä: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "line %d: pakettia ei ole olemassa: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "line %d: toinen %%description-osio\n"
@@ -1077,97 +1104,97 @@ msgstr "Ikonia %s ei voida lukea: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Tuntematon ikonityyppi: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "rivi %d: laiton merkki '%c' %s:ssä\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "rivi %d: laiton merkki %s:ssä\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "rivi %d: laiton merkkijono \"..\" %s:ssä\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "rivi %d: Epoch-kentän täytyy olla etumerkitön numero: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "rivi %d: virheellinen käännösarkkitehtuurin muoto: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Virheellinen pakettimäärittely: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paketti on jo olemassa: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "rivi %d: tuntematon nimiö: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} ei voi olla tyhjä\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} ei voi olla \"/\"\n"
@@ -1226,7 +1253,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Virheellinen patch-numero %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "rivi %d: toinen %%prep-osio\n"
@@ -1297,31 +1324,31 @@ msgstr "Ei voi avata %s:ää: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Sulkematon %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d parseExpressionBoolean palautti %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else ilman %%if:iä\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif ilman %%if:iä\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "virheellinen %%include-lause\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Ei yhteensopivia arkkitehtureeja käännökselle\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paketissa ei ole %%description-osiota: %s\n"
@@ -1368,27 +1395,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Virhe jäsennettäessä %%setup-osiota: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Suoritetaan(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Puuttuva %s %s %s:ssä\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Liian monta parametriä datarivillä %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Käsitellään tiedostoja: %s\n"
@@ -1413,7 +1440,7 @@ msgstr "Siirtyminen hakemistoon %s ei onnistunut: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ei voitu suorittaa %s:ää: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Ei voitu suorittaa %s:ää: %s\n"
@@ -1462,7 +1489,7 @@ msgstr "Etsitään %s:ää: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "%s:ää ei löytynyt\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "määrittelytiedoston %s kysely epäonnistui\n"
@@ -1730,91 +1757,99 @@ msgstr "%s on Delta RPM eikä sitä voida suoraan asentaa\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Tuntematon kuorma (%s) paketissa %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "lue <TIEDOSTO:...> vakiotiedostojen sijaan"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<TIEDOSTO:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "älä tarkista pakettien tarkistussummia"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "älä tarkista otsikkotietoja haettaessa tietokanssata"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "älä tarkista paketin allekirjoitusta"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "lähetä vakiotuloste <komento>:lle"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "käytä <hakem> ylimpänä hakemistona"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "näytä tunnetut kyselymuodot"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "näytä lopullinen rpmrc ja makro-konfiguraatio"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "tulosta vähemmän yksityiskohtia"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "tulosta enemmän yksityiskohtia"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1835,16 +1870,16 @@ msgstr "siirroissa pitää olla =-merkki"
 msgid "relocations must have a / following the ="
 msgstr "siirroissa pitää olla / =-merkin jälkeen"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "lisää ehdotetut paketit transaktioon"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1852,159 +1887,155 @@ msgstr ""
 "poista kaikki paketit, joiden nimeä vastaa  <paketti> (tavallisesti, jos  "
 "<paketti> määrittää useita paketteja, tulee virhe)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "älä suorita pakettikohtaisia skriptejä"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "poista paketti"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "älä asenna konfigurointiedostoja"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "älä asenna dokumentointia"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "ohita <polku>-alkuiset tiedostot"
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<polku>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "havaitse tiedostokonfliktit pakettien välillä"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "lyhenne parametreille --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "päivitä vain jo asennetut paketit"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<pakettitiedosto>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "älä tarkista paketin käyttöjärjestelmää"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "älä tarkista levytilaa ennen asennusta"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "asenna dokumentaatio"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "asenna paketteja"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr "älä tarkista tiedostojen tarkistussummia"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr "älä tarkista tiedostojen tarkistussummia"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr ""
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "älä suorita %%pre-scriptiä"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "älä suorita %%post-scriptiä"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "älä suorita %%preun-scriptiä"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "älä suorita %%postun scriptiä"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "älä suorita tämän paketin laukaisemia skriptejä"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "älä suorita %%triggerprein skriptejä"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "älä suorita %%triggerin skriptejä"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "älä suorita %%triggerun scriptejä"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "älä suorita %%triggerpostun scriptejä"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2012,39 +2043,39 @@ msgstr ""
 "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
 "automaattisesti)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "tulosta asennuksen eteneminen prosentteina"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<hakemisto>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<vanha>=<uusi>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "älä huomioi tiedostokonflikteja pakettien välillä"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "asenna uudelleen, jos paketti on jo asennettu"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "älä asenna, mutta kerro onnistuisiko se"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "päivitä paketteja"
 
@@ -2133,10 +2164,6 @@ msgstr "luettele paketin tiedostot"
 msgid "skip %%ghost files"
 msgstr "ohita %%ghost tiedostot"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "käytä seuraava kyselyformaattia"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "näytä lueteltujen tiedostojen tilat"
@@ -2744,31 +2771,31 @@ msgstr "Ota yhteyttä %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "En voi avata %s luettavaksi: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Ei voitu luoda tilapäistiedostoa %s:lle: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr ""
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s scripti epäonnistui, waitpid(%d) palautti %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s skripti epäonnistui, signaali %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s skripti epäonnistui, palautti %d\n"
@@ -2777,11 +2804,11 @@ msgstr "%s skripti epäonnistui, palautti %d\n"
 msgid "Unknown format"
 msgstr "Tuntematon formaatti"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2882,11 +2909,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "failed"
 msgstr "epäonnistui"
 
@@ -2960,143 +2987,133 @@ msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "indeksin %s avaus db%d:llä ei onnistu - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "dbpath ei ole asetettu\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "virhe(%d) haettaessa \"%s\" tietueita indeksistä %s\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: ohitetaan"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "virhe(%d) tallennettaessa tietuetta #%d %s:ään\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec epäonnistui: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp epäonnistui: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: ohitetaan"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: ohitetaan vioittunut otsikkotietue #%u.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "virhe(%d) haettaessa \"%s\" tietueita indeksistä %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "virhe(%d) lisättäessä otsikkon #%d tietuetta\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "virhe(%d) poistettaessa otsikon #%d tietuetta\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: otsikkoa ei voida lukea (0x%x)\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "virhe(%d) asetettaessa \"%s\" tietuetita indeksistä %s\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "virhe(%d) tallennettaessa tietuetta %s %s:ään\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "virhe(%d) poistettaessa tietuetta %s %s:stä\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "virhe(%d) varattaessa uutta paketti-instanssia\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "virhe(%d) tallennettaessa tietuetta %s %s:ään\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "väliaikainen tietokanta %s on jo olemassa\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "hakemiston %s luonti epäonnistui: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "tietue numero %u tietokannassa viallinen -- ohitetaan.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "alkupäisen tietueen %u lisäys ei onnistu\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "tietokannan uudelleenrakennus epäonnistui: alkuperäinen kanta paikallaan\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "vanhan tietokannan korvaus uudella epäonnistui!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "korvaa tiedostot %s:ssä tiedostoilla %s:stä korjataksesi"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "hakemiston %s poisto epäonnistui: %s\n"
@@ -3330,27 +3347,27 @@ msgstr ""
 msgid "failed to create directory"
 msgstr "hakemiston luonti epäonnistui"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "virheellinen syntaksi lua-skriptissä: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "virheellinen syntaksi lua-skriptissä: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua-skripti epäonnistui: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "virheellinen syntaksi lua-tiedostossa: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua-koukku epäonnistui: %s\n"
@@ -3451,14 +3468,25 @@ msgstr "%s: pakettilistan luku epäonnistui: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "älä tarkista otsikon ja kuorman allekirjoitusta"
 
-#~ msgid "query a spec file"
-#~ msgstr "kysele määrittelytiedostoa"
-
-#~ msgid "Signature options:"
-#~ msgstr "Allekirjoitusvalitsimet:"
-
-#~ msgid "Database options:"
-#~ msgstr "Tietokantavalitsimet:"
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
+#~ "tarkistettaessa"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
+#~ "kyseltäessä ja tietokannan uudelleenluonnissa"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "havaitse tiedostokonfliktit pakettien välillä"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "väliaikainen tietokanta %s on jo olemassa\n"
 
 #~ msgid "no files to sign\n"
 #~ msgstr "ei tiedostoja allekirjoitettavaksi\n"
diff --git a/po/fr.po b/po/fr.po
index 059364a13..0487b1559 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM 4.2.1\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
@@ -68,129 +68,130 @@ msgstr "erreur dans la lecteur de l'entête du paquetage\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "Impossible de ré-ouvrir la charge utile: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "vérifier/questionner le(s) paquetage(s) d'un même groupe"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Options de requêtes (avec -q ou --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Options de vérifications (avec -V ou --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Options d'installation/désinstallation/mise à jour:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Options communes a tous les modes et executables rpm:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 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:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "option de requête inattendue"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "format de requête inattendu"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "source de requête inattendue"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "un seul mode majeur peut être specifié"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "seuls l'installation, la mise à jour, rmsource et rmspec peuvent être forcés"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "les fichiers ne peuvent être relogés qu'à l'installation"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "impossible d'utiliser --prefix avec --relocate ou --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 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:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 "--prefix ne peut être utilisé qu'à l'installation de nouveaux paquetages"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "les arguments de --prefix doivent commencer par un /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "utiliser --excludedocs _OU_ --includedocs (pas les 2)"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches ne peut être utilisé qu'à la désinstallation de paquetages"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ne peut être utilisé qu'à l'installation de paquetages"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 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:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -198,7 +199,7 @@ msgstr ""
 "les options désactivant les scripts ne peuvent être utilisées qu'à la (dés)"
 "installation"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -206,46 +207,38 @@ msgstr ""
 "les options desactivant les triggers ne peuvent être utilisées qu'à la (dés)"
 "installation"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps ne peut être spécifié que pour la (re)construction, la "
-"recompilation, l'(dés)installation, et la vérification"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test ne peut être spécifié que pour la (dés)installation et la construction"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 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"
+"--justdb ne peut être utilisé qu'à l'installation/la désinstallation de "
+"paquetages"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "les arguments ed --root (-r) doivent commencer par un /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "n'a aucun paquetage à désinstaller"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "n'a aucun paquetage à installer"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "aucun argument fourni à la requête"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "aucun argument fourni à la vérification"
 
@@ -397,7 +390,7 @@ msgstr "effacer le fichier spec une fois terminé"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "aller directement à l'étape spécifiée (seulement pour c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "surcharger la plate-forme cible"
 
@@ -456,96 +449,131 @@ msgstr "Construction pour plate-formes cibles: %s\n"
 msgid "Building for target %s\n"
 msgstr "Construction pour cible %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "initialiser la base de données"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "refaire les listes inversées de la base de données à partir des entêtes des "
 "paquetages installés"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "vérifier les fichiers de la base de données"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Options de la base de données"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "vérifier la(les) signature(s) du paquetage"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "importer une clé publique blindé"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Otions de signatures"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "aucun argument fourni"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "installer le(s) paquetage(s)"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signer le(s) paquetage(s) (identique à --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "vérifier la(les) signature(s) du paquetage"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Otions de signatures"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Impossible d'exécuter %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 "Vous devez affecter une valeur à \"%%_gpg_name\" dans votre fichier de "
 "macros\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Entrez la phrase de passe: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Phrase de passe bonne.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Mauvaise phrase de passe\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "questionner un fichier spec"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "utiliser le format de requête suivant"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Otions de signatures"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Incapable d'ouvrir un fichier temporaire.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Exécution_de(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "L'exec de %s a échoué (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Mauvais status de sortie pour %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -748,32 +776,32 @@ msgstr "Substitution non permise: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Fichier non trouvé par la substitution: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Ne peut ouvrir le fichier donné à %%files %s: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "Ligne: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Mauvais fichier: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Mauvais possesseur/groupe: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Vérification des fichiers non empaquetés: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -782,12 +810,12 @@ msgstr ""
 "Fichier(s) installé(s) (mais non empaquetés):\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Traitement des fichiers: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1006,30 +1034,30 @@ msgstr "nom manquant dans le %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "absence de description dans le %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "ligne %d: erreur dans l'analyxe syntaxique de la %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "ligne %d: mauvaise option %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "ligne %d: trop de noms: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "ligne %d: package inexistant: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "ligne %d: deuxième description\n"
@@ -1114,97 +1142,97 @@ msgstr "Impossible de lire l'icône %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Type d'icône inconnu: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, 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:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "ligne %d: caractère '-' illégal dans %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "ligne %d: caractère '-' illégal dans %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "ligne %d: caractère '-' illégal dans %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "ligne %d: tag malformé: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "ligne %d: tag vide: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, 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:747
+#: build/parsePreamble.c:722
 #, 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:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "ligne %d: le champ Epoch/Serial doit être un nombre: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "ligne %d: Mauvais %s: qualifiers: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "ligne %d: mauvais format pour BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Erreur interne: tag bidon %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "ligne %d: Version requise: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Mauvaise specification de paquetage: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paquetage déjà existant: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "ligne %d: tag inconnu: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot ne peut pas être \"/\": %s\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot ne peut pas être \"/\": %s\n"
@@ -1264,7 +1292,7 @@ msgstr "%s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "numéro de paquetage invalide: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "ligne %d: deuxième %%prep\n"
@@ -1337,31 +1365,31 @@ msgstr "Impossible d'ouvrir %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "%%if non terminé\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean retourne %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, 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:368
+#: build/parseSpec.c:359
 #, 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:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include malformé\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Pas d'architecture compatible pour construction\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Le paquetage n'a pas de %%description: %s\n"
@@ -1408,27 +1436,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Erreur d'analyse syntaxique du %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Exécution_de(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "%s manquant(e) dans %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Trop d'arguments dans la ligne de données à %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Traitement des fichiers: %s-%s-%s\n"
@@ -1453,7 +1481,7 @@ msgstr "Impossible d'exécuter %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Impossible d'exécuter %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Impossible d'ouvrir %s: %s\n"
@@ -1503,7 +1531,7 @@ msgstr "Fichier %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Impossible de lire %s: %s.\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1784,91 +1812,99 @@ msgstr "%s ne peut être installé\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "prédéfinir la MACRO avec l'EXPRression"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "definit MACRO ayant pour valeur EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "affiche la macro-expansion d'EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "Lire <FICHIER:...> au lieu du(des) fichier(s) par défaut"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FICHIER:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "ne pas vérifier les sommes de hachage du paquetage"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 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"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "ne pas vérifier la(les) signature(s) du paquetage"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "envoyer la sortie standard à CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "utiliser RACINE comme répertoire racine"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "RACINE"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "afficher les tags de requête connus"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "afficher la configuration finale des macros et rpmrc"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "afficher moins de détails"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "afficher plus de détails"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "afficher la version de rpm utilisé"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "déboguer la machine à états du fichier de la charge utile"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "déboguer les E/S de rpmio"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: table d'option mal configurée (%d)\n"
@@ -1889,16 +1925,16 @@ msgstr "les relogement doivent contenir un ="
 msgid "relocations must have a / following the ="
 msgstr "dans les relogements un / doit suivre le ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "rajouter à la transaction les paquetages suggérés"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1906,169 +1942,164 @@ msgstr ""
 "retirer tous les paquetages qui correspondent à <paquetage> (normalement on "
 "retourne une erreur si le <paquetage> correspond à plusieurs paquetages"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "ne pas exécuter le(s) scriptlet(s) du paquetages"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "reloger des fichiers d'un paquetage non relogeable"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "désinstaller un paquetage"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<paquetage>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "ne pas installer les fichiers de configuration"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "ne pas installer la documentation"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "sauter les fichiers commence par le <chemin> indiqué"
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<chemin>"
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "reloger des fichiers d'un paquetage non relogeable"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "raccourci pour --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "met à jour le(s) paquetage(s) déjà installé(s)"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<paquetage>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 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:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "ne pas vérifier l'architecture du paquetage"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "ne pas vérifier le système d'exploitation du paquetage"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "ne pas vérifier l'espace disque avant l'installation"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "installer la documentation"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "installer le(s) paquetage(s)"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 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:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "ne pas vérifier les dépendances du paquetage"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "ne pas vérifier les sommes MD5 des fichiers"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "ne pas vérifier les sommes MD5 des fichiers"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "ne pas installer les fichiers de configuration"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 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:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "ne pas suggérer de résolution pour les dépendances manquantes"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "ne pas exécuter le scriptlet %%pre (s'il existe)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "ne pas exécuter le scriptlet %%post (s'il existe)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "ne pas exécuter le scriptlet %%preun (s'il existe)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "ne pas exécuter le scriptlet %%postun (s'il existe)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 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:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "n'exécuter aucun scriplet %%triggerprein"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "n'exécuter aucun scriplet %%triggerin"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "n'exécuter aucun scriptlet %%triggerun"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "n'exécuter aucun scriptlet %%triggerpostun"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2076,39 +2107,39 @@ msgstr ""
 "mettre à jour avec un paquetage plus ancien (une m-à-j avec --force fait ça "
 "automatiquement"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "afficher le pourcentage d'installation du paquetage"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "reloge le paquetage vers <rep>, si relogeable"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<rep>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "reloge les fichiers du <vieux> chemin vers <nouveau>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<vieux>=<nouveau>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "réinstalle si le paquetage est déjà installé"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "mises à jour des paquetages"
 
@@ -2202,10 +2233,6 @@ msgstr "lister les fichiers du paquetage"
 msgid "skip %%ghost files"
 msgstr "éviter les fichiers fantômes %%ghost"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "utiliser le format de requête suivant"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "affiche la liste des fichiers et leur état"
@@ -2840,31 +2867,31 @@ msgstr "Contactez %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Impossible d'ouvrir %s en lecture: %s.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Impossible d'ouvrir %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Impossible d'ouvrir %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s) échec du scriptlet, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n"
@@ -2874,12 +2901,12 @@ msgstr "%s(%s-%s-%s) échec du scriplet, code de sortie %d\n"
 msgid "Unknown format"
 msgstr "tag inconnu"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(déjà installé) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2982,11 +3009,11 @@ msgstr "Verification de signature: MAUVAIS PARAMETRES\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signature: INCONNUE (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "échec %s: %s\n"
@@ -3061,148 +3088,138 @@ msgstr "| attendu a la fin de l'expression"
 msgid "array iterator used with different sized arrays"
 msgstr "itérateur de tableau utilisé avec des tableaux de tailles différentes"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, 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"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "aucun dbpath n'a été fourni\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, 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"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: on saute"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "erreur(%d) en stockant l'article nº%d dans %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: échec de fseek: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: échec de l'ouverture: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: on saute"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, 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"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "erreur(%d) en attrapant les articles \"%s\" de l'index %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr ""
 "erreur(%d) en affectant l'article de l'entête nº%d pour l'enlèvement de %s\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr ""
 "erreur(%d) en affectant l'article de l'entête nº%d pour l'enlèvement de %s\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: impossible de lire l'entête à 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, 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"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erreur(%d) en stockant l'article \"%s\" dans %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erreur(%d) en enlevant l'article \"%s\" de %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erreur(%d) en allouant une nouvelle instance de paquetage\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erreur(%d) en stockant l'article %s dans %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "aucun dbpath fourni"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "la base de données temporarire %s existe déjà\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "Ne peut détruire le répertoire %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, 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"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "impossible d'ajouter l'article qui était au départ à %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 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"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "Ne peut remplacer la vieille base de données par la nouvelle!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, 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"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Ne peut détruire le répertoire %s: %s\n"
@@ -3437,27 +3454,27 @@ msgstr "Le fichier %s est plus petit que %u octets\n"
 msgid "failed to create directory"
 msgstr "Ne peut détruire le répertoire %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "- non supporté sur des chaînes de caractères\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- non supporté sur des chaînes de caractères\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: échec de Fwrite: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "numéro de paquetage invalide: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: échec de fseek: %s\n"
@@ -3560,13 +3577,31 @@ msgstr "%s: échec de la lecture de la liste de paquetages: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ne pas vérifier la signature de l'entete+charge_utile"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps ne peut être spécifié que pour la (re)construction, la "
+#~ "recompilation, l'(dés)installation, et la vérification"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ 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"
+
+#, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "reloger des fichiers d'un paquetage non relogeable"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "la base de données temporarire %s existe déjà\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr ""
 #~ "questionner/vérifier le(s) paquetage(s) grâce à un identifieur de fichier"
 
-#~ msgid "query a spec file"
-#~ msgstr "questionner un fichier spec"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3579,12 +3614,6 @@ msgstr "ne pas vérifier la signature de l'entete+charge_utile"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Tampon cible en surcharge\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Otions de signatures"
-
-#~ msgid "Database options:"
-#~ msgstr "Options de la base de données"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "aucun fichier à signer\n"
 
diff --git a/po/is.po b/po/is.po
index 969d3982d..3589904c8 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -16,7 +16,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM �tg�fa %s\n"
@@ -57,168 +57,160 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "fyrirspurn/yfirfer� � pakkann sam � skr�"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+msgid "only installation and upgrading may be forced"
 msgstr ""
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-
-#: rpmqv.c:239
+#: rpmqv.c:230
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -355,7 +347,7 @@ msgstr ""
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr ""
 
@@ -413,93 +405,125 @@ msgstr "���i fyrir markkerfi: %s\n"
 msgid "Building for target %s\n"
 msgstr "���i fyrir markkerfi %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr ""
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr ""
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr ""
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "b�a til undirskrift"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+msgid "Keyring options:"
+msgstr ""
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr ""
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "setja inn pakka"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "b�a til undirskrift"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr ""
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+msgid "query spec file(s)"
+msgstr ""
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr ""
+
+#: rpmspec.c:42
+msgid "Spec options:"
+msgstr ""
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Get ekki opna� tempi skr�.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Gat ekki keyrt %s (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -699,44 +723,44 @@ msgstr "Gat ekki opna� PreUn skr�: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Skr�in fannst ekki me� 'glob': %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Gat ekki opna� %%files skr�na %s: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "l�na: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�gild skr� %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "%s br�st\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -958,30 +982,30 @@ msgstr ""
 msgid "no description in %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "l�na %d: �leyfilegur rofi %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr ""
@@ -1066,97 +1090,97 @@ msgstr "Gat ekki lesi� t�knmynd %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "��ekkt tegund t�knmyndar: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, 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:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "l�na %d: �l�glegt t�kn '-' � %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "l�na %d: �l�glegt t�kn '-' � %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "l�na %d: �l�glegt t�kn '-' � %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "l�na %d: Skemmt tag: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "l�na %d: T�mt tag: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "l�na %d: Epoch/Serial sv��i� ver�ur a� innihalda t�lu: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "l�na %d: �leyfilegur rofi %s: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr ""
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr ""
@@ -1216,7 +1240,7 @@ msgstr "%s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "�gilt %s t�kn: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1287,31 +1311,31 @@ msgstr "Get ekki opna� %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1358,27 +1382,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "l�na %d: Villa vi� ��ttun %s: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr ""
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "vantar '(' �  %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr ""
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "%s br�st\n"
@@ -1403,7 +1427,7 @@ msgstr "Gat ekki keyrt %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Gat ekki b�i� til undirferli (fork) %s: %s\n"
@@ -1453,7 +1477,7 @@ msgstr "Skr� %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "gat ekki fundi� %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1725,96 +1749,104 @@ msgstr ""
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "prenta �tv�kkun fj�lva <expr>+"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "ekki sko�a pakkaskilyr�in"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "ekki sko�a pakkaskilyr�in"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "ekki sko�a pakkaskilyr�in"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "senda fr�lag � <skipun>"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "s�na endanlega rpmrc og stillingar fj�lva"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "prenta �tg�fun�mer rpm sem veri� er a� nota"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1835,217 +1867,213 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "fyrirspurn/yfirfer� � pakkann sam � skr�"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<pakkaskr�>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "birta einungis stillingaskr�r (innifelur -l)"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr ""
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr ""
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<pakkaskr�>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "setja inn pakka"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "ekki yfirfara MD5 undirritun skr�a"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "ekki yfirfara MD5 undirritun skr�a"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "birta einungis stillingaskr�r (innifelur -l)"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<g�mul>=<n�>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "uppf�ra pakka"
 
@@ -2139,10 +2167,6 @@ msgstr ""
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr ""
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr ""
@@ -2754,31 +2778,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Get ekki opna� %s til lesturs: %s.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Gat ekki b�i� til undirferli (fork) %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Gat ekki b�i� til undirferli (fork) %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s br�st\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s br�st\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s br�st\n"
@@ -2788,11 +2812,11 @@ msgstr "%s br�st\n"
 msgid "Unknown format"
 msgstr "��ekkt tegund t�knmyndar: %s\n"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2894,11 +2918,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s br�st\n"
@@ -2976,142 +3000,132 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, 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"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: Fseek br�st: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr ""
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr ""
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr ""
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "gat ekki b�i� til %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3346,27 +3360,27 @@ msgstr "Skr�in %s er minni en %u b�ti\n"
 msgid "failed to create directory"
 msgstr "gat ekki b�i� til %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s br�st\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek br�st: %s\n"
diff --git a/po/it.po b/po/it.po
index e007b5780..e1424a133 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # translation of it.po to
 # Copyright (C) 2006 Free Software Foundation, Inc.
-# 
-# 
+#
+#
 # Francesco Tombolini <tombo@adamantio.net>, 2008.
 # Silvio Pierro <perplesso82@gmai.com>,2008.
 # Guido Grazioli <guido.grazioli@gmail.com>, 2010.
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2010-11-10 16:56+0200\n"
 "Last-Translator: Guido Grazioli <guido.grazioli@gmail.com>\n"
 "Language-Team: Italian <trans-it@lists.fedoraproject.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KAider 0.1\n"
 
 #: cliutils.c:20 lib/poptI.c:29
@@ -24,7 +24,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versione %s\n"
@@ -36,8 +36,11 @@ msgstr "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 
 #: cliutils.c:32
 #, c-format
-msgid "This program may be freely redistributed under the terms of the GNU GPL\n"
-msgstr "Questo programma può essere ridistribuito liberamente sotto i termini della GNU GPL\n"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
+msgstr ""
+"Questo programma può essere ridistribuito liberamente sotto i termini della "
+"GNU GPL\n"
 
 #: cliutils.c:52
 #, c-format
@@ -64,156 +67,193 @@ msgstr "errore durante la lettura dell'intestazione dal pacchetto\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "impossibile riaprire il payload: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr "Opzioni di selezione pacchetti per le operazioni Query/Verify:"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Opzioni d'interrogazione (con -q o --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Opzioni di verifica (con -V o --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opzioni Installa/Aggiorna/Rimuovi:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opzioni comuni per tutte le modalità e gli eseguibili rpm:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "è possibile eseguire solo un tipo di interrogazione/verifica per volta"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "flag di interrogazione inaspettati"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "formato di interrogazione inaspettato"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "origine d'interrogazione inaspettata"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "è possibile specificare solo una modalità principale"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
-msgstr "è possibile forzare solo i processi di installazione, aggiornamento, rmsource e rmspec"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
+msgstr ""
+"è possibile forzare solo i processi di installazione, aggiornamento, "
+"rmsource e rmspec"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
-msgstr "i file possono essere riposizionati solo durante l'installazione del pacchetto"
+msgstr ""
+"i file possono essere riposizionati solo durante l'installazione del "
+"pacchetto"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "impossibile usare --prefix con --relocate o --excludepath"
 
-#: rpmqv.c:165
-msgid "--relocate and --excludepath may only be used when installing new packages"
-msgstr "--relocate e --excludepath possono essere usati solo quando si installano nuovi pacchetti"
+#: rpmqv.c:161
+msgid ""
+"--relocate and --excludepath may only be used when installing new packages"
+msgstr ""
+"--relocate e --excludepath possono essere usati solo quando si installano "
+"nuovi pacchetti"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix può essere usato solo quando si installano nuovi pacchetti"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "gli argomenti per --prefix devono iniziare con /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
-msgstr "--hash (-h) può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--hash (-h) può essere specificato solo durante l'installazione del pacchetto"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
-msgstr "--percent può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--percent può essere specificato solo durante l'installazione del pacchetto"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
-msgstr "--replacepkgs può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--replacepkgs può essere specificato solo durante l'installazione del "
+"pacchetto"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
-msgstr "--excludedocs può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--excludedocs può essere specificato solo durante l'installazione del "
+"pacchetto"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
-msgstr "--includedocs può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--includedocs può essere specificato solo durante l'installazione del "
+"pacchetto"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "è possibile specificare solo uno tra  --excludedocs e --includedocs"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
-msgstr "--ignorearch può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--ignorearch può essere specificato solo durante l'installazione del "
+"pacchetto"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
-msgstr "--ignoreos può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--ignoreos può essere specificato solo durante l'installazione del pacchetto"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
-msgstr "--ignoresize può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--ignoresize può essere specificato solo durante l'installazione del "
+"pacchetto"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
-msgstr "--allmatches può essere specificato solo durante la rimozione del pacchetto"
+msgstr ""
+"--allmatches può essere specificato solo durante la rimozione del pacchetto"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
-msgstr "--allfiles può essere specificato solo durante l'installazione del pacchetto"
+msgstr ""
+"--allfiles può essere specificato solo durante l'installazione del pacchetto"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
-msgstr "--justdb può essere specificato solo durante l'installazione e la rimozione del pacchetto"
+msgstr ""
+"--justdb può essere specificato solo durante l'installazione e la rimozione "
+"del pacchetto"
 
-#: rpmqv.c:225
-msgid "script disabling options may only be specified during package installation and erasure"
-msgstr "le opzioni per la disabilitazione dello script possono essere specificate solo durante l'installazione e la rimozione del pacchetto"
+#: rpmqv.c:221
+msgid ""
+"script disabling options may only be specified during package installation "
+"and erasure"
+msgstr ""
+"le opzioni per la disabilitazione dello script possono essere specificate "
+"solo durante l'installazione e la rimozione del pacchetto"
+
+#: rpmqv.c:226
+msgid ""
+"trigger disabling options may only be specified during package installation "
+"and erasure"
+msgstr ""
+"le opzioni di disabilitazione dell'attivazione possono essere specificate "
+"solo durante l'installazione e la rimozione del pacchetto"
 
 #: rpmqv.c:230
-msgid "trigger disabling options may only be specified during package installation and erasure"
-msgstr "le opzioni di disabilitazione dell'attivazione possono essere specificate solo durante l'installazione e la rimozione del pacchetto"
+#, fuzzy
+msgid ""
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
+msgstr ""
+"--test può essere specificato solo durante l'installazione, rimozione e "
+"creazione del pacchetto"
 
 #: rpmqv.c:234
-msgid "--nodeps may only be specified during package building, rebuilding, recompilation, installation,erasure, and verification"
-msgstr "--nodeps può essere specificato solo durante la creazione, ricreazione, ricompilazione, installazione, eliminazione e verifica del pacchetto"
-
-#: rpmqv.c:239
-msgid "--test may only be specified during package installation, erasure, and building"
-msgstr "--test può essere specificato solo durante l'installazione, rimozione e creazione del pacchetto"
-
-#: rpmqv.c:244
-msgid "--root (-r) may only be specified during installation, erasure, querying, and database rebuilds"
-msgstr "--root (-r) può essere specificato solo durante l'installazione, la rimozione, l'interrogazione e nei processi di ricreazione del database"
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr ""
+"--justdb può essere specificato solo durante l'installazione e la rimozione "
+"del pacchetto"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "gli argomenti per --root (-r) devono iniziare con /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "non è stato specificato alcun pacchetto per la rimozione"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "non è stato specificato alcun pacchetto per l'installazione"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "non è stato specificato alcun argomento per l'interrogazione"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "non è stato specificato alcun argomento per la verifica"
 
@@ -225,7 +265,9 @@ msgstr "buildroot è già specificato, ignora %s\n"
 #: rpmbuild.c:119
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <specfile>"
-msgstr "compila attraverso %prep (scompatta i sorgenti e applica le patch) da <specfile>"
+msgstr ""
+"compila attraverso %prep (scompatta i sorgenti e applica le patch) da "
+"<specfile>"
 
 #: rpmbuild.c:120 rpmbuild.c:123 rpmbuild.c:126 rpmbuild.c:129 rpmbuild.c:132
 #: rpmbuild.c:135 rpmbuild.c:138
@@ -238,7 +280,8 @@ msgstr "compila attraverso %build (%prep, e poi compila) da <specfile>"
 
 #: rpmbuild.c:125
 msgid "build through %install (%prep, %build, then install) from <specfile>"
-msgstr "compila attraverso %install (%prep, %build, e poi installa) da <specfile>"
+msgstr ""
+"compila attraverso %install (%prep, %build, e poi installa) da <specfile>"
 
 #: rpmbuild.c:128
 #, c-format
@@ -260,7 +303,9 @@ msgstr "compila solo il pacchetto sorgente da <specfile>"
 #: rpmbuild.c:141
 #, c-format
 msgid "build through %prep (unpack sources and apply patches) from <tarball>"
-msgstr "compila attraverso %prep (scompatta i sorgenti ed applica le patch) da <tarball>"
+msgstr ""
+"compila attraverso %prep (scompatta i sorgenti ed applica le patch) da "
+"<tarball>"
 
 #: rpmbuild.c:142 rpmbuild.c:145 rpmbuild.c:148 rpmbuild.c:151 rpmbuild.c:154
 #: rpmbuild.c:157 rpmbuild.c:160
@@ -301,8 +346,10 @@ msgid "<source package>"
 msgstr "<source package>"
 
 #: rpmbuild.c:166
-msgid "build through %install (%prep, %build, then install) from <source package>"
-msgstr "compila attraverso %install (%prep, %build, poi installa) da <source package>"
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+"compila attraverso %install (%prep, %build, poi installa) da <source package>"
 
 #: rpmbuild.c:170
 msgid "override build root"
@@ -348,13 +395,15 @@ msgstr "rimuovi specfile quando terminato"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "salta fino alla fase specificata (solo per c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "annulla la piattaforma target"
 
 #: rpmbuild.c:211
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
-msgstr "Opzioni di compilazione 'Build' con [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+"Opzioni di compilazione 'Build' con [ <specfile> | <tarball> | <source "
+"package> ]:"
 
 #: rpmbuild.c:231
 msgid "Failed build dependencies:\n"
@@ -405,90 +454,127 @@ msgstr "Creazione piattaforme target in corso: %s\n"
 msgid "Building for target %s\n"
 msgstr "Creazione per il target %s in corso\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "inizializza database"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
-msgstr "ricompila gli elenchi invertiti del database dalle intestazioni dei pacchetti installati"
+msgstr ""
+"ricompila gli elenchi invertiti del database dalle intestazioni dei "
+"pacchetti installati"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "verifica dei file del database"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Opzioni del database:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "verifica firma(e) del pacchetto"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "importa una armored public key"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr "elenca le chiavi del keyring RPM"
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Opzioni della firma:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "non è stato specificato alcun argomento"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 msgid "sign package(s)"
 msgstr "firma i pacchetti"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "firma pacchetto/i (identico a --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "cancella le firme del pacchetto"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Opzioni della firma:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Impossibile eseguire %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "È necessario impostare \"%%_gpg_name\" nel file macro\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Inserire la frase chiave:"
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "La frase chiave risulta valida.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Controllo frase chiave fallito\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "interrogare un file spec"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "usare il seguente formato di interrogazione"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Opzioni della firma:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Impossibile aprire il file temp.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Esecuzione(%s) in corso: %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Esecuzione di %s fallita (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Stato d'uscita errato da %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -691,32 +777,32 @@ msgstr "Glob non permesso: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "File non trovato da glob: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Impossibile aprire %%files file %s: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "riga: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "File errato: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Proprietario/gruppo errato: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Controllo per file scompattato/i in corso: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -725,12 +811,12 @@ msgstr ""
 "Trovato/i file installati (ma scompattati):\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Elaborazione file: %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binari dipendenti dall'architettura presenti in un pacchetto noarch\n"
 
@@ -949,30 +1035,30 @@ msgstr "nome mancante in %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "nessuna descrizione in %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "riga %d: Errore durante l'analisi di %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "riga  %d: Opzione errata %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "riga %d: Troppi nomi: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "riga %d: Pacchetto non esistente: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "riga %d: Seconda descrizione\n"
@@ -1057,97 +1143,97 @@ msgstr "Impossibile leggere l'icona %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Tipo di icona sconosciuto: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "riga %d: Il tag necessita di un solo token: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "riga %d: Carattere '%c' illegale in: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "riga %d: Carattere illegale in: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "riga %d: Sequenza \"..\" illegale in: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "riga %d: Etichetta malformata: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "riga %d: Etichetta vuota: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "riga %d: I prefissi non devono finire con \"/\": %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "riga %d: Docdir deve iniziare con '/': %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "riga %d: Il campo Epoch deve essere un numero: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "riga %d: %s errati: qualificatori: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "riga %d: Formato BuildArchitecture errato: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "riga %d: Sono supportati solo sottopacchetti noarch: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Errore interno: Etichetta Bogus %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "riga %d: %s è deprecato: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Specifiche errate del pacchetto: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Il pacchetto è già esistente: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "riga %d: Tag sconosciuto: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} non può essere vuota\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} non può essere \"/\"\n"
@@ -1206,15 +1292,18 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Numero patch non valido %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "riga %d: secondo %%prep\n"
 
 #: build/parseReqs.c:109
 #, c-format
-msgid "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
-msgstr "riga %d: I token della dipendenza devono iniziare con i caratteri alfa-numerici, '_' o '/': %s\n"
+msgid ""
+"line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s\n"
+msgstr ""
+"riga %d: I token della dipendenza devono iniziare con i caratteri alfa-"
+"numerici, '_' o '/': %s\n"
 
 #: build/parseReqs.c:136
 #, c-format
@@ -1276,31 +1365,32 @@ msgstr "Impossibile aprire %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Non chiuso %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean ritorna %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Possiede un %%else con nessun %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Possiede un %%endif con nessun %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "istruzione %%include malformata\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
-msgstr "Non è stata trovata alcuna architettura compatibile per la compilazione\n"
+msgstr ""
+"Non è stata trovata alcuna architettura compatibile per la compilazione\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Il pacchetto non possiede alcuna %%description: %s\n"
@@ -1341,30 +1431,34 @@ msgstr "Impossibile determinare il nome della policy: %s\n"
 
 #: build/policies.c:198
 #, c-format
-msgid "'%s' type given with other types in %%semodule %s. Compacting types to '%s'.\n"
-msgstr "Tipo '%s' impostato con altri tipi in %%semodule %s. Compattazione dei tipi in '%s'.\n"
+msgid ""
+"'%s' type given with other types in %%semodule %s. Compacting types to "
+"'%s'.\n"
+msgstr ""
+"Tipo '%s' impostato con altri tipi in %%semodule %s. Compattazione dei tipi "
+"in '%s'.\n"
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Errore nel parsing di %s: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Atteso tag %%semodule: %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Percorso del modulo mancante alla linea: %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Troppi argomenti alla linea: %s\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, c-format
 msgid "Processing policies: %s\n"
 msgstr "Elaborazione policies: %s\n"
@@ -1389,7 +1483,7 @@ msgstr "Impossibile chdir in %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Impossibile eseguire %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Impossibile biforcare %s: %s\n"
@@ -1438,7 +1532,7 @@ msgstr "Ricerca di %s in corso: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Impossibile trovare %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "interrogazione di specfile %s fallita, impossibile analizzare\n"
@@ -1574,7 +1668,8 @@ msgstr "il gruppo %s non esiste - utilizzazione utente root\n"
 #: lib/fsm.c:1355
 #, c-format
 msgid "archive file %s was not found in header file list\n"
-msgstr "file archive %s non è stato trovato nell'elenco dei file di intestazione\n"
+msgstr ""
+"file archive %s non è stato trovato nell'elenco dei file di intestazione\n"
 
 #: lib/fsm.c:1796 lib/fsm.c:1943
 #, c-format
@@ -1706,91 +1801,99 @@ msgstr "%s è un Delta RPM e non può essere installato direttamente\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Payload non supportato (%s) nel pacchetto %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "predefinisci MACRO con un valore EXPR"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "definisci MACRO con un valore EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "stapare espansione macro di EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "leggi <FILE:...> invece del file predefinito/i"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "non verificare il digest del pacchetto/i"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "non verificare l'intestazione/i del database una volta ripristinata"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "non verificare la firma/e del pacchetto"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "invia stdout a CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "usa ROOT come cartella top level"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "visualizza etichette di interrogazione conosciute"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "visualizza la configurazione finale di rpmrc e macro"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "fornisci un output meno dettagliato"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "fornisci un output più dettagliato"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "visualizza la versione di rpm utilizzata"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "macchina di stato del file payload di debug"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "debug rpmio I/O"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabella opzioni configurata in modo errato (%d)\n"
@@ -1811,207 +1914,215 @@ msgstr "riposizionamenti devono contenere un ="
 msgid "relocations must have a / following the ="
 msgstr "i riposizionamenti devono avere una / che segue ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "aggiungere i pacchetti suggeriti alla transazione"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
-msgstr "installare tutti i file, anche le configurazioni che possono altrimenti essere saltate"
+msgstr ""
+"installare tutti i file, anche le configurazioni che possono altrimenti "
+"essere saltate"
 
-#: lib/poptI.c:121
-msgid "remove all packages which match <package> (normally an error is generated if <package> specified multiple packages)"
-msgstr "rimuovere tutti i pacchetti corrispondenti a <package> (normalmente viene generato un errore se con <package> vengono specificati pacchetti multipli)"
+#: lib/poptI.c:122
+msgid ""
+"remove all packages which match <package> (normally an error is generated if "
+"<package> specified multiple packages)"
+msgstr ""
+"rimuovere tutti i pacchetti corrispondenti a <package> (normalmente viene "
+"generato un errore se con <package> vengono specificati pacchetti multipli)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "non eseguire le scriptlet dei pacchetti"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "riposiziona i file in un pacchetto non-riposizionabile"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "mostra le dipendenze cicliche come avviso"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "rimuovi (disinstalla) il pacchetto"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<package>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "non installare i file di configurazione"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "non installare la documentazione"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "salta i file che presentano un componente <path> che li precede "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<path>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "rileva i conflitti dei file fra pacchetti"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "abbreviazione di --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "aggiorna il pacchetto/i se già installati"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<packagefile>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
-msgstr "mostra i caratteri hash durante l'installazione del pacchetto (utile con -v)"
+msgstr ""
+"mostra i caratteri hash durante l'installazione del pacchetto (utile con -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "non verificare l'architettura del pacchetto"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "non verificare il sistema operativo del pacchetto"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "non controllare lo spazio del disco prima dell'installazione"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "installa documentazione"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "installa i pacchetto/i"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "aggiorna il database, senza modificare il filesystem"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "non verificare le dipendenze dei pacchetti"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr "non verificare il digest dei file"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr "non verificare il digest dei file (obsoleto)"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "non installare contesti di sicurezza dei file"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
-msgstr "non riordinare l'installazione dei pacchetti per soddisfare le dipendenze"
+msgstr ""
+"non riordinare l'installazione dei pacchetti per soddisfare le dipendenze"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "non suggerire alcuna risoluzione delle dipendenze mancanti"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "non eseguire alcun scriptlet %%pre (se esistenti)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "non eseguire alcun scriptlet %%post (se esistenti)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "non eseguire alcun scriptlet %%preun (se esistenti)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "non eseguire alcun scriptlet %%postun (se esistenti)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "non eseguire alcun scriptlet causato/i da questo pacchetto"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "non eseguire alcun scriptlet %%triggerprein"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "non eseguire alcun scriptlet %%triggerin"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "non eseguire alcun scriptlet %%triggerun"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "non eseguire alcun scriptlet %%triggerpostun"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr "non eseguire azioni sulle collezioni"
 
-#: lib/poptI.c:242
-msgid "upgrade to an old version of the package (--force on upgrades does this automatically)"
-msgstr "aggiorna ad una versione più vecchia del pacchetto (sugli aggiornamenti --force esegue questa operazione automaticamente)"
+#: lib/poptI.c:240
+msgid ""
+"upgrade to an old version of the package (--force on upgrades does this "
+"automatically)"
+msgstr ""
+"aggiorna ad una versione più vecchia del pacchetto (sugli aggiornamenti --"
+"force esegue questa operazione automaticamente)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "mostra le percentuali durante l'installazioni dei pacchetti"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "riposiziona il pacchetto su <dir>, se riposizionabile"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "riposiziona i file dal percorso <old> a <new>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<old>=<new>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "ignora i file in conflitto fra pacchetti"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "installa nuovamente se il pacchetto è già presente"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "non installare, ma indicare se funziona oppure no"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "aggiorna il pacchetto/i"
 
@@ -2037,11 +2148,13 @@ msgstr "interrogare/verificare un file del pacchetto"
 
 #: lib/poptQV.c:84
 msgid "query/verify package(s) with package identifier"
-msgstr "interrogare/verificare il pacchetto/i con un identificatore del pacchetto"
+msgstr ""
+"interrogare/verificare il pacchetto/i con un identificatore del pacchetto"
 
 #: lib/poptQV.c:86
 msgid "query/verify package(s) with header identifier"
-msgstr "interrogare/verificare il pacchetto/i con un identificatore di intestazione"
+msgstr ""
+"interrogare/verificare il pacchetto/i con un identificatore di intestazione"
 
 #: lib/poptQV.c:89
 msgid "rpm query mode"
@@ -2053,7 +2166,8 @@ msgstr "interrogare/verificare una istanza dell'intestazione"
 
 #: lib/poptQV.c:93
 msgid "query/verify package(s) from install transaction"
-msgstr "interrogare/verificare il pacchetto/i dalla transazione di installazione"
+msgstr ""
+"interrogare/verificare il pacchetto/i dalla transazione di installazione"
 
 #: lib/poptQV.c:95
 msgid "query the package(s) triggered by the package"
@@ -2100,10 +2214,6 @@ msgstr "elenca i file in un pacchetto"
 msgid "skip %%ghost files"
 msgstr "salta file %%ghost"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "usare il seguente formato di interrogazione"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "visualizza gli stati dei file elencati"
@@ -2228,7 +2338,8 @@ msgstr "il pacchetto non possiede alcun elenco gruppo/proprietario dei file\n"
 
 #: lib/query.c:229
 msgid "package has neither file owner or id lists\n"
-msgstr "il pacchetto non possiede ne un proprietario del file ne un elenco id\n"
+msgstr ""
+"il pacchetto non possiede ne un proprietario del file ne un elenco id\n"
 
 #: lib/query.c:319
 #, c-format
@@ -2313,7 +2424,8 @@ msgstr "%s: headerRead fallito\n"
 #: lib/rpmchecksig.c:125
 #, c-format
 msgid "%s: Immutable header region could not be read. Corrupted package?\n"
-msgstr "%s: La regione header immutabile non può essere letta. Pacchetto corrotto?\n"
+msgstr ""
+"%s: La regione header immutabile non può essere letta. Pacchetto corrotto?\n"
 
 #: lib/rpmchecksig.c:159
 #, c-format
@@ -2374,11 +2486,14 @@ msgstr "SI"
 
 #: lib/rpmds.c:845
 msgid "PreReq:, Provides:, and Obsoletes: dependencies support versions."
-msgstr "Supporto alla versione per le dipendenze PreReq:, Provides: e Obsoletes:."
+msgstr ""
+"Supporto alla versione per le dipendenze PreReq:, Provides: e Obsoletes:."
 
 #: lib/rpmds.c:848
 msgid "file name(s) stored as (dirName,baseName,dirIndex) tuple, not as path."
-msgstr "file name conservati come tuple (dirName,baseName,dirIndex), non come percorsi."
+msgstr ""
+"file name conservati come tuple (dirName,baseName,dirIndex), non come "
+"percorsi."
 
 #: lib/rpmds.c:852
 msgid "package payload can be compressed using bzip2."
@@ -2398,15 +2513,19 @@ msgstr "il/i file payload del pacchetto presentano un prefisso \"./\""
 
 #: lib/rpmds.c:867
 msgid "package name-version-release is not implicitly provided."
-msgstr "il nome-versione-release del pacchetto non viene implicitamente fornito."
+msgstr ""
+"il nome-versione-release del pacchetto non viene implicitamente fornito."
 
 #: lib/rpmds.c:870
 msgid "header tags are always sorted after being loaded."
-msgstr "i tag delle intestazioni vengono sempre ordinate dopo il loro caricamento."
+msgstr ""
+"i tag delle intestazioni vengono sempre ordinate dopo il loro caricamento."
 
 #: lib/rpmds.c:873
 msgid "the scriptlet interpreter can use arguments from header."
-msgstr "l'interprete di scriptlet può utilizzare gli argomenti presenti nell'intestazione."
+msgstr ""
+"l'interprete di scriptlet può utilizzare gli argomenti presenti "
+"nell'intestazione."
 
 #: lib/rpmds.c:876
 msgid "a hardlink file set may be installed without being complete."
@@ -2414,7 +2533,9 @@ msgstr "un set di file hardlink può essere installato senza che sia completo."
 
 #: lib/rpmds.c:879
 msgid "package scriptlets may access the rpm database while installing."
-msgstr "le scriptlet del pacchetto potrebbero accedere al database rpm durante l'installazione."
+msgstr ""
+"le scriptlet del pacchetto potrebbero accedere al database rpm durante "
+"l'installazione."
 
 #: lib/rpmds.c:883
 msgid "internal support for lua scripts."
@@ -2430,7 +2551,8 @@ msgstr "supporto per le file capabilities POSIX.1e"
 
 #: lib/rpmds.c:895
 msgid "package scriptlets can be expanded at install time."
-msgstr "le scriptlet del pacchetto possono essere espanse durante l'installazione."
+msgstr ""
+"le scriptlet del pacchetto possono essere espanse durante l'installazione."
 
 #: lib/rpmgi.c:49 lib/rpminstall.c:115 lib/rpminstall.c:292
 #: lib/rpminstall.c:323 tools/rpmgraph.c:93 tools/rpmgraph.c:130
@@ -2588,27 +2710,34 @@ msgstr "il percorso %s nel pacchetto %s non è riposizionabile"
 #: lib/rpmprob.c:133
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
-msgstr "il file %s entra in conflitto durante il tentativo d'installazione di %s e %s"
+msgstr ""
+"il file %s entra in conflitto durante il tentativo d'installazione di %s e %s"
 
 #: lib/rpmprob.c:138
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
-msgstr "il file %s dell'installazione di %s entra in conflitto con il file del pacchetto %s"
+msgstr ""
+"il file %s dell'installazione di %s entra in conflitto con il file del "
+"pacchetto %s"
 
 #: lib/rpmprob.c:143
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
-msgstr "il pacchetto %s (il quale risulta essere più recente di %s) è già installato"
+msgstr ""
+"il pacchetto %s (il quale risulta essere più recente di %s) è già installato"
 
 #: lib/rpmprob.c:148
 #, c-format
 msgid "installing package %s needs %<PRIu64>%cB on the %s filesystem"
-msgstr "l'installazione del pacchetto %s necessita di %<PRIu64>%cB sul filesystem %s"
+msgstr ""
+"l'installazione del pacchetto %s necessita di %<PRIu64>%cB sul filesystem %s"
 
 #: lib/rpmprob.c:158
 #, c-format
 msgid "installing package %s needs %<PRIu64> inodes on the %s filesystem"
-msgstr "l'installazione del pacchetto %s necessita di %<PRIu64> inode sul filesystem %s"
+msgstr ""
+"l'installazione del pacchetto %s necessita di %<PRIu64> inode sul filesystem "
+"%s"
 
 # fix bug 450663
 # (team-it-rev080611)
@@ -2636,7 +2765,9 @@ msgstr "%s reso obsoleto da %s%s"
 #: lib/rpmprob.c:178
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
-msgstr "si è verificato un errore sconosciuto %d durante la manipolazione del pacchetto %s"
+msgstr ""
+"si è verificato un errore sconosciuto %d durante la manipolazione del "
+"pacchetto %s"
 
 #: lib/rpmrc.c:186
 #, c-format
@@ -2713,31 +2844,31 @@ msgstr "Si prega di contattare %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Impossibile aprire %s per la lettura: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "supporto agli scriptlet <lua> non disponibile\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Impossibile creare il file temporaneo per %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Impossibile duplicare il file descriptor: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "scriptlet %s fallita, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "scriptlet %s fallita, segnale %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "scriptlet %s fallita, uscita con stato %d\n"
@@ -2746,11 +2877,11 @@ msgstr "scriptlet %s fallita, uscita con stato %d\n"
 msgid "Unknown format"
 msgstr "Formato sconosciuto"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 msgid "install"
 msgstr "installa"
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr "elimina"
 
@@ -2828,7 +2959,8 @@ msgstr "sigh sigSize(%zd): BAD, fstat(2) fallito\n"
 
 #: lib/signature.c:303
 msgid "Immutable header region could not be read. Corrupted package?\n"
-msgstr "Impossibile leggere la regione immutabile dell'header. Pacchetto corrotto?\n"
+msgstr ""
+"Impossibile leggere la regione immutabile dell'header. Pacchetto corrotto?\n"
 
 #: lib/signature.c:397
 msgid "MD5 digest:"
@@ -2851,11 +2983,11 @@ msgstr "Verifica firma: PARAMETRI ERRATI\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Firma: SCONOSCIUTA (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr "saltato"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "failed"
 msgstr "fallito"
 
@@ -2929,142 +3061,132 @@ msgstr "| previsto alla fine dell'espressione"
 msgid "array iterator used with different sized arrays"
 msgstr "iteratore di array usato con array di dimensioni differenti"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr "Generazione di %d indici mancanti, prego attendere...\n"
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d non disponibile\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "impossibile aprire l'indice %s utilizando db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "non è stato impostato alcun dbpath\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "errore(%d) durante l'acquisizione dei record \"%s\" dall'indice %s\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: salto"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "errore(%d) nella memorizzazione del record #%d in %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec fallito: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp fallito: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: salto"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: intestazione #%u danneggiata -- viene omessa.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "errore(%d) durante l'acquisizione dei record \"%s\" dall'indice %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "errore(%d) nell'impostazione del record #%d dell'intestazione\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "errore(%d) nell'eliminazione del record dell'intestazione #%d\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: impossibile leggere intestazione 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "errore(%d) nell'impostazione dei record \"%s\" dall'indice %s\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "errore(%d) nella memorizzazione del record \"%s\" in %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "errore(%d) nella rimozione del record \"%s\" da %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "errore(%d) nell'allocazione di una nuova istanza del pacchetto\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "errore(%d) nella memorizzazione del record %s in %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "non è stato impostato alcun dbpath"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "il database temporaneo %s è già esistente\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "impossibile creare la cartella %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "l'intestazione #%u nel database non è valida -- viene omessa.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "impossibile aggiungere il record originariamente su %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "ricompilazione database fallita: il database originale rimane in uso\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "sostituzione del vecchio database con il nuovo database fallita!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "per eseguire un ripristino sostituire i file in %s con i file di %s"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "rimozione della directory %s fallita: %s\n"
@@ -3190,11 +3312,15 @@ msgstr "Impossibile espandere il percorso restorecon"
 
 #: plugins/sepolicy.c:570
 msgid "Failed to relabel filesystem. Files may be mislabeled\n"
-msgstr "Errore durante il relabel del filesystem. I file potrebbero avere label non corrette\n"
+msgstr ""
+"Errore durante il relabel del filesystem. I file potrebbero avere label non "
+"corrette\n"
 
 #: plugins/sepolicy.c:574
 msgid "Failed to reload file contexts. Files may be mislabeled\n"
-msgstr "Errore nel caricamento dei file context. I file potrebbero avere label non corrette\n"
+msgstr ""
+"Errore nel caricamento dei file context. I file potrebbero avere label non "
+"corrette\n"
 
 #: plugins/sepolicy.c:601
 #, c-format
@@ -3262,8 +3388,12 @@ msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opzione %c sconosciuta in %s(%s)\n"
 
 #: rpmio/macro.c:1036
-msgid "Too many levels of recursion in macro expansion. It is likely caused by recursive macro declaration.\n"
-msgstr "Troppo livelli di ricorsione nell'espansione della macro. Si tratta probabilmente di una macro definita ricorsivamente.\n"
+msgid ""
+"Too many levels of recursion in macro expansion. It is likely caused by "
+"recursive macro declaration.\n"
+msgstr ""
+"Troppo livelli di ricorsione nell'espansione della macro. Si tratta "
+"probabilmente di una macro definita ricorsivamente.\n"
 
 #: rpmio/macro.c:1105 rpmio/macro.c:1122
 #, c-format
@@ -3294,27 +3424,27 @@ msgstr "File %s è più piccolo di %u byte\n"
 msgid "failed to create directory"
 msgstr "impossibile creare la directory"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "sintassi non valida nella scriptlet lua: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "sintassi non valida nello script lua: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua script fallito: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "sintassi non valida nel file lua: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua hook fallito: %s\n"
@@ -3415,11 +3545,28 @@ msgstr "%s: lettura manifesto fallita: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "non verificare firma header+payload"
 
-#~ msgid "Signature options:"
-#~ msgstr "Opzioni della firma:"
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps può essere specificato solo durante la creazione, ricreazione, "
+#~ "ricompilazione, installazione, eliminazione e verifica del pacchetto"
 
-#~ msgid "Database options:"
-#~ msgstr "Opzioni del database:"
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) può essere specificato solo durante l'installazione, la "
+#~ "rimozione, l'interrogazione e nei processi di ricreazione del database"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "rileva i conflitti dei file fra pacchetti"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d non disponibile\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "il database temporaneo %s è già esistente\n"
 
 #~ msgid "Internal error in argument processing (%d) :-(\n"
 #~ msgstr "Errore interno durante la processazione dell'argomento (%d) :-(\n"
@@ -3437,7 +3584,8 @@ msgstr "non verificare firma header+payload"
 #~ msgstr "è possibile usare --sign solo durante la compilazione del pacchetto"
 
 #~ msgid "no packages files given for rebuild"
-#~ msgstr "non è stato specificato alcun file del pacchetto per la ricompilazione"
+#~ msgstr ""
+#~ "non è stato specificato alcun file del pacchetto per la ricompilazione"
 
 #~ msgid "no spec files given for build"
 #~ msgstr "non è stato specificato alcun file spec per la compilazione"
@@ -3478,9 +3626,6 @@ msgstr "non verificare firma header+payload"
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "interrogare/verificare il pacchetto/i con un identificatore di file"
 
-#~ msgid "query a spec file"
-#~ msgstr "interrogare un file spec"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3497,7 +3642,8 @@ msgstr "non verificare firma header+payload"
 #~ msgstr "genera firma"
 
 #~ msgid "%s: was already signed by key ID %s, skipping\n"
-#~ msgstr "%s: è stato già firmato dall'ID %s della chiave, omissione in corso\n"
+#~ msgstr ""
+#~ "%s: è stato già firmato dall'ID %s della chiave, omissione in corso\n"
 
 #~ msgid "Invalid %%_signature spec in macro file\n"
 #~ msgstr "Specifica %%_signature non valida nel file macro\n"
@@ -3566,7 +3712,8 @@ msgstr "non verificare firma header+payload"
 #~ msgstr "debug macchina stato di pacchetto"
 
 #~ msgid "query/verify package(s) from TOP file tree walk"
-#~ msgstr "interrogare/verificare il pacchetto/i dall'inizio del percorso ad albero"
+#~ msgstr ""
+#~ "interrogare/verificare il pacchetto/i dall'inizio del percorso ad albero"
 
 #~ msgid "query/verify package(s) from system HDLIST"
 #~ msgstr "interrogare/verificare il pacchetto/i dal system HDLIST"
@@ -3635,7 +3782,8 @@ msgstr "non verificare firma header+payload"
 #~ "The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n"
 #~ "\tA = \"%s\"\tB = \"%s\"\n"
 #~ msgstr ""
-#~ "La dipendenza \"B\" necessita di un'epoca (assumendo una stessa epoca di \"A\")\n"
+#~ "La dipendenza \"B\" necessita di un'epoca (assumendo una stessa epoca di "
+#~ "\"A\")\n"
 #~ "\tA = \"%s\"\tB = \"%s\"\n"
 
 #~ msgid "Data type %d not supported\n"
@@ -3702,7 +3850,8 @@ msgstr "non verificare firma header+payload"
 #~ msgstr "cerca le stringhe i18N nel catalogo specfile"
 
 #~ msgid "generate headers compatible with (legacy) rpm[23] packaging"
-#~ msgstr "ganara le intestazioni compatibili con il (legacy) rpm[23] packaging"
+#~ msgstr ""
+#~ "ganara le intestazioni compatibili con il (legacy) rpm[23] packaging"
 
 #~ msgid "cannot create %%%s %s\n"
 #~ msgstr "impossibile creare %%%s %s\n"
@@ -3762,7 +3911,9 @@ msgstr "non verificare firma header+payload"
 #~ msgstr "Errore sconosciuto o inatteso"
 
 #~ msgid "don't update cache database, only print package paths"
-#~ msgstr "non aggiornare il database della cache, visualizzare solo i percorsi del pacchetto"
+#~ msgstr ""
+#~ "non aggiornare il database della cache, visualizzare solo i percorsi del "
+#~ "pacchetto"
 
 #~ msgid "File tree walk options:"
 #~ msgstr "Opzioni navigazione albero dei file:"
@@ -3834,7 +3985,8 @@ msgstr "non verificare firma header+payload"
 #~ msgstr "argomento data/ora di rollback malformato"
 
 #~ msgid "save erased package files by renaming into sub-directory"
-#~ msgstr "salva i file del pacchetto rimosso rinominandoli in una sotto-directory"
+#~ msgstr ""
+#~ "salva i file del pacchetto rimosso rinominandoli in una sotto-directory"
 
 #~ msgid "save erased package files by repackaging"
 #~ msgstr "salva i file del pacchetto rimosso rieseguendo il packaging"
@@ -3872,8 +4024,12 @@ msgstr "non verificare firma header+payload"
 #~ msgid "========== recording tsort relations\n"
 #~ msgstr "========== registrazione relazioni tsort\n"
 
-#~ msgid "========== tsorting packages (order, #predecessors, #succesors, tree, depth, breadth)\n"
-#~ msgstr "========== tsorting dei pacchetti (ordine, #predecessori, #successori, albero, profondità)\n"
+#~ msgid ""
+#~ "========== tsorting packages (order, #predecessors, #succesors, tree, "
+#~ "depth, breadth)\n"
+#~ msgstr ""
+#~ "========== tsorting dei pacchetti (ordine, #predecessori, #successori, "
+#~ "albero, profondità)\n"
 
 #~ msgid "========== successors only (%d bytes)\n"
 #~ msgstr "========== solo successori (in ordine di presentazione)\n"
@@ -4071,10 +4227,15 @@ msgstr "non verificare firma header+payload"
 #~ msgstr "Impossibile salvare intestazione finale\n"
 
 #~ msgid "packaging version 1 is not supported by this version of RPM\n"
-#~ msgstr "il packaging della versione 1 non è supportato su questa versione di RPM\n"
+#~ msgstr ""
+#~ "il packaging della versione 1 non è supportato su questa versione di RPM\n"
 
-#~ msgid "only packaging with major numbers <= 4 is supported by this version of RPM\n"
-#~ msgstr "solo il packaging con numeri maggiori <= 4 viene supportato su questa versione di RPM\n"
+#~ msgid ""
+#~ "only packaging with major numbers <= 4 is supported by this version of "
+#~ "RPM\n"
+#~ msgstr ""
+#~ "solo il packaging con numeri maggiori <= 4 viene supportato su questa "
+#~ "versione di RPM\n"
 
 #~ msgid "%s: Can't sign v1 packaging\n"
 #~ msgstr "%s: Impossibile firmare il packaging v1\n"
diff --git a/po/ja.po b/po/ja.po
index 25d965bdb..7219cbc7f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm-4.8\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2010-09-21 01:05+0900\n"
 "Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM バージョン %s\n"
@@ -70,125 +70,126 @@ msgstr "パッケージのヘッダー読み込み中にエラー\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "ペイロードを再開けません: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr "パッケージセレクションを問い合わせ/検証するオプション:"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "問い合わせオプション (-q または --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "検証オプション (-V または --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "インストール/アップグレード/アンインストールオプション:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "全モード・コマンドで共通のオプション:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "問い合わせ/検証は一度に一つしか実行できません。"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "予期せぬ問い合わせのフラグ"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "予期せぬ問い合わせのフォーマット"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "予期せぬ問い合わせのソース"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "一つのメジャーモードのみを指定して下さい"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "インストール、アップグレード、ソース削除、スペックファイル削除時のみ強制でき"
 "ます。"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "ファイルはパッケージのインストール時にのみ再配置できます。"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "--prefix は --relocate や --excludepath とは同時には使用できません。"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate と --excludepath は新しいパッケージをインストールする時のみ使用で"
 "きます。"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix は新規パッケージのインストール時のみ使用できます。"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix の引数は / から始まらなければなりません。"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs と --includedocs は同時には指定できません。"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches はパッケージ削除時のみ指定できます。"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles はパッケージのインストール時のみ指定できます。"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb はパッケージ インストール・削除時のみ指定できます。"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -196,7 +197,7 @@ msgstr ""
 "スクリプトを無効にするようなオプションは、パッケージのインストール、削除時の"
 "み指定できます。"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -204,45 +205,35 @@ msgstr ""
 "トリガーを無効にするようなオプションはパッケージのインストール、削除時のみ指"
 "定できます。"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps はパッケージの作成、リビルド、リコンパイル、インストール、削除、検証"
-"時のみ指定できます。"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr "--test はパッケージのインストール/削除/作成時のみ指定できます。"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) はインストール、削除、問い合わせ、データベース再構築時のみ指定で"
-"きます"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb はパッケージ インストール・削除時のみ指定できます。"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) の引数は / から始まらなければなりません。"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "アンインストールするパッケージが指定されていません。"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "インストールするパッケージが指定されていません。"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "問い合わせのための引数が指定されていません。"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "検証のための引数が指定されていません。"
 
@@ -379,7 +370,7 @@ msgstr "終了時に spec ファイルを削除"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "指定した過程までスキップします (c, i でのみ有効)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "ターゲットプラットフォームを強制指定"
 
@@ -436,93 +427,128 @@ msgstr "ビルド対象プラットフォーム: %s\n"
 msgid "Building for target %s\n"
 msgstr "ターゲット %s 用にビルド中\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "データベースを初期化します。"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "インストールされたパッケージヘッダーから、データベースのインデックスを再構築"
 "します。"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "データベースの検証を行います。"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "データベース オプション:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "署名の検証を行います。"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "ASCII 化された公開鍵を取り込みます。"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "署名オプション:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "引数が指定されていません。"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "パッケージをインストールします。"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "パッケージに署名する (--addsign と同一です)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "パッケージの署名を削除する"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "署名オプション:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s を実行できませんでした: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "マクロファイル内で \"%%_gpg_name\" を設定しなければなりません。\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "パスフレーズの入力: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "パスフレーズは正常です。\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "パスフレーズのチェックに失敗しました。\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "spec ファイルを問い合わせます。"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "以下の問い合わせ書式を使用します。"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "署名オプション:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "一時ファイルを開けません。\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "実行中(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s の実行に失敗 (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s の不正な終了ステータス (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -727,32 +753,32 @@ msgstr "Glob は許可されていません: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "ファイルが見つかりません (by glob): %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "%%files のファイル %s を開けません: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "%s行目: \n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "不正なファイル: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "不正な所有者/グループ: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "伸張ファイルの検査中: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -761,12 +787,12 @@ msgstr ""
 "インストール済み(ただし未伸張)ファイルが見つかりました:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "ファイルの処理中: %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch パッケージ内にアーキテクチャ依存のバイナリー\n"
 
@@ -985,30 +1011,30 @@ msgstr "%%changelog 中に名前がありません\n"
 msgid "no description in %%changelog\n"
 msgstr "%%changelog 中に説明がありません\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d 行目: %%description の解析エラー: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d 行目: 不正なオプション %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "%d 行目: 名前が多すぎます: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "%d 行目: パッケージが存在しません: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "%d 行目: 2番目の説明\n"
@@ -1093,97 +1119,97 @@ msgstr "アイコン %s を読むことができません: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "不明なアイコンタイプ: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "%d 行目: タグはトークンを 1つしかとりません: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "%d 行目: 不正な文字 '%c' : %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "%d 行目: 不正な文字 '-' : %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "%d 行目: 不正なシーケンス 「..」 : %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "%d 行目: 不完全な形のタグ: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "%d 行目: 空のタグ: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "%d 行目: Prefix は \"/\" で終わってはいけません: %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "%d 行目: Docdir は '/' で始まらなければなりません: %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "%d 行目: Epoch フィールドは数字でなければなりません: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "%d 行目: 不正な修飾子 %s : %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "%d 行目: 不正な BuildArchtecture フォーマット: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "%d 行目: noarch サブ パッケージでのみサポート: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "内部エラー: にせのタグ %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "%d 行目: %s は非推奨: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "不正なパッケージの指定: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "パッケージは既に存在しています: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "%d 行目: 不明なタグ: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} を空にすることができません\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} を \"\" にすることができません\n"
@@ -1242,7 +1268,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "無効なパッケージ番号 %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "%d 行目: ふたつ目の %%prep\n"
@@ -1314,31 +1340,31 @@ msgstr "%s を開けません: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "%%if が閉じていません\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean が %d を返しました。\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%if がないのに %%else があります\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%if がないのに %%endif があります\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "おかしな %%include 行です\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "作成(build)可能な互換アーキテクチャはありません\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "パッケージには %%description がありません: %s\n"
@@ -1385,27 +1411,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "%%setup の構文解析エラー: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "実行中(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "%s が %s %s にありません\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "%s:%d でデータ行に引数が多すぎます\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "ファイルの処理中: %s\n"
@@ -1430,7 +1456,7 @@ msgstr "%s に作業ディレクトリーを移動できません: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s を実行できませんでした: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s のフォークに失敗しました: %s\n"
@@ -1480,7 +1506,7 @@ msgstr "%s を検索しています: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "%s の検索に失敗しました:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "スペックファイル %s の問い合わせに失敗しました。解析できません。\n"
@@ -1748,91 +1774,99 @@ msgstr "%s はデルタ RPM で、直接インストールできません。\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "パッケージ %s 内にサポートしていないペイロード (%s) です。\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "値 EXPR を持つマクロを予め定義します。"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "値 EXPR を持つ MACRO を定義します。"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "EXPR のマクロを展開した結果を表示します。"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "デフォルトファイルの代わりに <FILE:...> を読み込みます。"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "パッケージダイジェストの検証をしません。"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "取得したデータベースヘッダーを検証しません。"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "パッケージ署名の検証をしません。"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "標準出力を CMD に送信します。"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "ROOT をトップ ディレクトリーとして使用します。"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "全問い合わせタグを表示します。"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "最終的な rpmrc とマクロの設定を表示します。"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "詳細でない出力を提供します。"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "より詳細な出力を提供します。"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "使用している rpm のバージョンを表示します。"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "ペイロードのファイル状態マシンのデバッグ"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "rpmio 入出力のデバッグ"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: オプション テーブルの設定が正しくありません (%d)\n"
@@ -1853,15 +1887,15 @@ msgstr "再配置は = を含んでいなければなりません。"
 msgid "relocations must have a / following the ="
 msgstr "再配置は = の次に / でなければなりません。"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "トランザクションに提案パッケージを追加します。"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "設定がスキップを指示していても、全ファイルをインストールします。"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1869,160 +1903,156 @@ msgstr ""
 "<package> と一致するパッケージ全てを削除します(通常は <package> が複数のパッ"
 "ケージを指す場合はエラーになります)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "パッケージ指定のスクリプトを実行しません。"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "再配置不可能なパッケージのファイルを再配置します。"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "依存のループを警告として表示します。"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "パッケージを削除 (アンインストール) します。"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<package>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "設定ファイルをインストールしません。"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "ドキュメントをインストールしません。"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "パス <path> 中のファイルをスキップします。"
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<path>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "パッケージ間でのファイルの競合を検知します。"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs と --replacefiles を短縮したもの"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "既にインストール済みの場合のみアップグレード"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<packagefile>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "パッケージをインストールにつれて '#' を表示します (-v と使用すると良い)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "パッケージの対象アーキテクチャを検証しません。"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "パッケージ対象 OS の検証を行いません。"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "インストール前のディスク容量チェックを行いません。"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "ドキュメントをインストールします。"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "パッケージをインストールします。"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "データベースを更新しますが、ファイルシステムの変更は行いません。"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "パッケージの依存関係の検証を行いません。"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr "ファイルのダイジェストを検証しません。"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr "ファイルのダイジェストを検証しません (旧式)。"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "ファイルのセキュリティ コンテキストをインストールしません。"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "依存性を満たす為のパッケージのインストール順序を変更しません。"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "不足する依存関係の解決を提案しません。"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "%%pre スクリプトを実行しません。"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "%%post スクリプトを実行しません。"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "%%preun スクリプトを実行しません。"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "%%postun スクリプトを実行しません。"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "このパッケージによってトリガーされるスクリプトを実行しません。"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "%%triggerprein スクリプトを実行しません。"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "%%triggerin スクリプトを実行しません。"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "%%triggerun スクリプトを実行しません。"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "%%triggerpostun スクリプトを実行しません。"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr "いかなる収集活動も行わないでください。"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2030,39 +2060,39 @@ msgstr ""
 "古いバージョンのパッケージにアップグレードします(アップグレード時の --force "
 "はこれを自動的に行います)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "インストールする際にパーセント表示を行います。"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "パッケージが再配置可能ならば、 <dir> に再配置します。"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "パス <old> からパス <new> にファイルを再配置させます。"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<old>=<new>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "パッケージ間のファイルの競合を無視します。"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "既に存在するパッケージでも再インストールします。"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "インストールせずに、テストのみを行います。"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "パッケージをアップグレードします。"
 
@@ -2152,10 +2182,6 @@ msgstr "パッケージ中のファイルを列挙します。"
 msgid "skip %%ghost files"
 msgstr "%%ghost ファイルをスキップします。"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "以下の問い合わせ書式を使用します。"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "列挙したファイルの状態を表示します。"
@@ -2774,31 +2800,31 @@ msgstr "%s に連絡してください。\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "%s を読み込み用に開けません: %m。\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua> スクリプトは組み込みでサポートしていません\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "%s の一次ファイルの作成に失敗しました: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "ファイル ディスクリプターの複製ができません: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s スクリプトの実行に失敗しました。waitpid (%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s スクリプトの実行に失敗しました。シグナル %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s スクリプトの実行に失敗しました。終了ステータス %d\n"
@@ -2807,11 +2833,11 @@ msgstr "%s スクリプトの実行に失敗しました。終了ステータス
 msgid "Unknown format"
 msgstr "不明な書式"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 msgid "install"
 msgstr "インストール"
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr "削除"
 
@@ -2914,11 +2940,11 @@ msgstr "署名確認: 異常なパラメータです。\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "署名: 未知(%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr "スキップした"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "failed"
 msgstr "失敗"
 
@@ -2992,143 +3018,133 @@ msgstr "式の終わりに | が期待されます。"
 msgid "array iterator used with different sized arrays"
 msgstr "配列の繰り返し指定が、サイズが異なる配列の間で使用されています"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d は利用できません\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "%s インデックスを db%d で開けません - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "dbpath が設定されていません\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "エラー(%d) - レコード \"%s\" 取得時 (%s インデックスから)\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: スキップします。"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "エラー(%d) - レコード #%d を %s に格納時\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: 正規表現に失敗しました: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp に失敗しました: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: スキップします。"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 "rpmdb: 破損したヘッダーインスタンス #%u を取得しました。スキップします。\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "エラー(%d) - レコード \"%s\" 取得時 (%s インデックスから)\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "エラー(%d) - ヘッダー #%d レコードの追加時\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "エラー(%d) - ヘッダー #%d レコードの削除時\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ヘッダーを読むことができません (0x%x)\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "エラー(%d) - \"%s\" のレコード設定時 (%s インデックスから)\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "エラー(%d) - レコード \"%s\" を %s に格納時\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "エラー(%d) - レコード \"%s\" を %s から削除時\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "エラー(%d) - 新しいパッケージインスタンスの割り当て時\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "エラー(%d) - レコード %s を %s にストア時\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "dbpath が設定されていません。"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "一時的なデータベース %s は既に存在しています。\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "ディレクトリー %s の作成に失敗しました: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "データベース中のヘッダー #%u は不正です -- スキップします。\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "元々 %u にあったレコードを追加できません。\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "データベースの再構築に失敗: オリジナルのデータベースは残っています。\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "古いデータベースを新しいデータベースで置き換えるのに失敗!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "復元するには %s 内のファイルを %s 内のファイルで置き換えて下さい"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ディレクトリー %s の削除に失敗しました: %s\n"
@@ -3364,27 +3380,27 @@ msgstr "ファイル %s は %u バイトより小さくなっています。\n"
 msgid "failed to create directory"
 msgstr "ディレクトリーの作成に失敗しました"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "lua スクリプトで不正な文法がありました: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "lua スクリプトで不正な文法がありました: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua スクリプトに失敗しました: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "lua ファイルに不正な文法がありました: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua のフックに失敗しました: %s\n"
@@ -3485,21 +3501,35 @@ msgstr "%s: manifest の読み込みに失敗: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ヘッダーとペイロード署名を検証しません。"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps はパッケージの作成、リビルド、リコンパイル、インストール、削除、"
+#~ "検証時のみ指定できます。"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) はインストール、削除、問い合わせ、データベース再構築時のみ指定"
+#~ "できます"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "パッケージ間でのファイルの競合を検知します。"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d は利用できません\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "一時的なデータベース %s は既に存在しています。\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "ファイル ID でパッケージを問い合わせ/検証します。"
 
-#~ msgid "query a spec file"
-#~ msgstr "spec ファイルを問い合わせます。"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
-#~ msgid "Signature options:"
-#~ msgstr "署名オプション:"
-
-#~ msgid "Database options:"
-#~ msgstr "データベース オプション:"
-
 #~ msgid "Internal error in argument processing (%d) :-(\n"
 #~ msgstr "引数処理 (%d) での内部エラー :-(\n"
 
diff --git a/po/ko.po b/po/ko.po
index 33ff7137a..0b253acf9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -16,7 +16,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ���� - %s\n"
@@ -57,175 +57,166 @@ msgstr "��Ű���� ����� �д� ���� ������ �߻��߽��ϴ�\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "payload�� �ٽ� �� �� ����: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "�׷� ���� ��Ű���� ����/���� �մϴ�"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "���� �ɼ� (-q �Ǵ� --query �ɼǰ� �Բ� ���):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "���� �ɼ� (-V �Ǵ� --verify �ɼǰ� �Բ� ���):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "��ġ/���׷��̵�/���� �ɼ�:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "��� rpm ��忡���� �Ϲ����� �ɼ�:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "����/���� ������ ���� �ٸ� ������ ���ÿ� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "�������� ���� �÷��� �Դϴ�"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "�������� ���� ���� �Դϴ�"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "�������� ���� �ҽ� �Դϴ�"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "�ϳ��� ��(major) ��常 ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr "��ġ, ���׷��̵�, �ҽ� ����, spec ���� �����ÿ��� ����˴ϴ�"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "��Ű�� ��ġ�ÿ��� ������ ���ġ�� �� �ֽ��ϴ�"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate �� --excludepath �ɼ��� �ֽ��� ��Ű���� ��ġ�� ������ ����� �� ��"
 "���ϴ�"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix �ɼ��� �ֽ��� ��Ű���� ��ġ�� ������ ����� �� �ֽ��ϴ�"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix �ɼ��� �μ��� �ݵ�� '/' �� �����ؾ� �մϴ�"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs �� --includedocs �ɼǸ� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches �ɼ��� ��Ű�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles �ɼ��� ��Ű�� ��ġ�ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "��ũ��Ʈ ���� �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "Ʈ���� ���� �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps �ɼ��� ��Ű�� ����, ������(rebuild), ��������(recompile), ��ġ, ��"
-"��, �����ÿ��� ������ �� �ֽ��ϴ�"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr "--test �ɼ��� ��Ű�� ��ġ, ����, ���۽ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) �ɼ��� ��Ű�� ��ġ, ����, ����, �����ͺ��̽� �籸��ÿ��� ������ "
-"�� �ֽ��ϴ�"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb �ɼ��� ��Ű�� ��ġ�� �����ÿ��� ������ �� �ֽ��ϴ�"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) �ɼ��� �μ��� �ݵ�� '/' �� �����ؾ� �մϴ�"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "������ ��Ű���� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "��ġ�� ��Ű���� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "���ǿ� �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "������ �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
@@ -363,7 +354,7 @@ msgstr "��Ű�� ���� �Ŀ� spec������ �����մϴ�"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "������ �ܰ�� �ٷ� �����մϴ� (c,i ������ ��� ����)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "��ǥ���(target) �÷����� ��ü(override)�մϴ�"
 
@@ -422,97 +413,132 @@ msgstr "��ǥ���(target) �÷������� ���� ��: %s\n"
 msgid "Building for target %s\n"
 msgstr "%s(��)�� �����ϰ� �ֽ��ϴ�\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "�����ͺ��̽��� �ʱ�ȭ �մϴ�"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "��ġ�� ��Ű�� ������� ��ݵ� ���(inverted lists)�� �����ͺ��̽��� �籸�� ��"
 "�ϴ�"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "�����ͺ��̽� ������ �˻��մϴ�"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "�����ͺ��̽� �ɼ�:"
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "��Ű���� ������ �˻��մϴ�"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "���� �ɼ�:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 #, fuzzy
 msgid "no arguments given"
 msgstr "���ǿ� �ʿ��� �μ��� �������� �ʾҽ��ϴ�"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "��Ű���� ��ġ�մϴ�"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "��Ű���� �����մϴ� (������ ������ �����˴ϴ�)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "��Ű���� ������ �˻��մϴ�"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "���� �ɼ�:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s(��)�� ������ �� ����: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "��ũ�� ���� �ȿ� �ݵ�� \"%%_gpg_name\"�� �����ؾ� �մϴ�\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "�н� ����(pass phrase) �Է�: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "�н� ����(pass phrase)�� ��ġ�մϴ�.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "�н� ����(pass phrase)�� �ùٸ��� �ʽ��ϴ�\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "spec ���Ͽ� ���� �����մϴ�"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "������ ���� ������ ����Ͻʽÿ�"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "���� �ɼ�:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "�ӽ� ������ �� �� �����ϴ�.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "���� ��(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s�� ���࿡ ������ (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s�� �߸��� ���� ��Ȳ (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -715,44 +741,44 @@ msgstr "Glob�� ����� �� ����: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "glob���� ������ � �� ����: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "%s ������ %%files�� �� �� ����: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "��: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�߸��� ����: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�߸��� ������/�׷�: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "��ī�̺긦 Ǫ�µ� ������%s%s: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "���� ó�� ��: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -971,30 +997,30 @@ msgstr "%%changelog�� �̸��� �����ֽ��ϴ�\n"
 msgid "no description in %%changelog\n"
 msgstr "%%changelog�� ����(description)�� �����ϴ�\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d ��° ��: %%description���� ������ �߻��߽��ϴ�: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d ��° ��: %s(��)�� �߸��� �ɼ��Դϴ�: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "%d ��° ��: �̸��� �ʹ� �����ϴ�: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "%d ��° ��: ��Ű���� �������� �ʽ��ϴ�: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "%d ��° ��: �ι�° ����(description)\n"
@@ -1079,97 +1105,97 @@ msgstr "%s �������� ���� �� ����: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "�� �� ���� ������ ����: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "%d ��° ��: �±׿� �ϳ��� ��ū�� �ֽ��ϴ�: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "%d ��° ��: %s�� �������� ���� '-' �� ����: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "%d ��° ��: %s�� �������� ���� '-' �� ����: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "%d ��° ��: %s�� �������� ���� '-' �� ����: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "%d ��° ��: �ùٸ��� ���� �±��Դϴ�: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "%d ��° ��: �±װ� ����ֽ��ϴ�: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "%d ��° ��: Prefixes�� ���� \"/\" �� �������� �ȵ˴ϴ�: %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "%d ��° ��: Docdir�� �ݵ�� '/' �� �����ؾ� �մϴ�: %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "%d ��° ��: Epoch/Serial �׸�(field)�� �ݵ�� �����̾�� �մϴ�: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "%d ��° ��: �߸��� %s: ������(qualifier): %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "%d ��° ��: �߸��� BuildArchitecture �����Դϴ�: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "���� ����: ���Ž�(Bogus) �±� %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "%d ��° ��: ������ �ʿ��մϴ�: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "�߸��� ��Ű�� ����: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "��Ű���� �̹� ������: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "%d ��° ��: �� �� ���� �±��Դϴ�: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot�� \"/\" �� ������ �� ����: %s\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot�� \"/\" �� ������ �� ����: %s\n"
@@ -1229,7 +1255,7 @@ msgstr "%s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "�������� ��Ű�� ��ȣ: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "%d ��° ��: �ι�° %%prep\n"
@@ -1302,31 +1328,31 @@ msgstr "%s(��)�� �� �� ����: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "%%if�� ������ �ʾҽ��ϴ�\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean���� %d ���� ��ȯ�Ǿ����ϴ�\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else�� %%if ���� ���Ǿ����ϴ�\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif�� %%if ���� ���Ǿ����ϴ�\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include ���� �ùٸ��� �ʽ��ϴ�\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "��Ű�� ���ۿ� ȣȯ�ϴ� ��Ű���ĸ� ã�� �� �����ϴ�\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "������ %%description�� ����: %s\n"
@@ -1373,27 +1399,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "%%setup���� ���� �߻�: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "���� ��(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "%2$s %3$s�� %1$s �� �����ϴ�\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "%s�� ������ �׸�(line)�� �μ��� �ʹ� ����:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "���� ó�� ��: %s-%s-%s\n"
@@ -1418,7 +1444,7 @@ msgstr "%s(��)�� ������ �� ����: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s(��)�� ������ �� ����: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s(��)�� fork �� �� ����: %s\n"
@@ -1468,7 +1494,7 @@ msgstr "%s(��)�� � ��: (%s ���)...\n"
 msgid "Failed to find %s:\n"
 msgstr "%s(��)�� �� ������:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1747,99 +1773,107 @@ msgstr "%s(��)�� ��ġ�� �� �����ϴ�\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "<ǥ����>+ �� ��ũ�� Ȯ���� ����մϴ�"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "�⺻ ��ũ�� ���� ��� <����:..>�� �о���Դϴ�"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "��Ű���� �������� �˻����� �ʽ��ϴ�"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "��Ű���� ��Ű���ĸ� �˻����� �ʽ��ϴ�"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "��Ű���� ������ �˻��մϴ�"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "ǥ������� <����>���� �����ϴ�"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "<���丮>�� �ֻ��� ���丮�� ����մϴ�"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "���� �±׸� �����ݴϴ�"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "���� �����Ǿ� �ִ� rpmrc�� ����� ��ũ�θ� �����ݴϴ�"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "�ڼ��� ����� �����մϴ�"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "���� ���� ����� �����մϴ�"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "���� ���ǰ� �ִ� rpm ������ ǥ���մϴ�"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "��ǻ���� ����(state) ������ ����� �մϴ�"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "rpmio ��/����� ����� �մϴ�"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1860,18 +1894,18 @@ msgstr "���ġ�ÿ��� �ݵ�� '=' �� �����ؾ� �մϴ�"
 msgid "relocations must have a / following the ="
 msgstr "���ġ�ÿ��� �ݵ�� '=' �ڿ� '/' �� �;� �մϴ�"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "��ġ ������ ���� ��Ű���� ����/���� �մϴ�"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "Ư�� ������ �����ϱ� ���� ������ ����� ��쿡��, ��Ű�� ���� ��� ������ ��"
 "ġ�մϴ�"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1879,170 +1913,165 @@ msgstr ""
 "<��Ű��> �̸��� ��ġ�ϴ� ��Ű���� ��� �����մϴ� (<��Ű��>�� �������� ��Ű��"
 "�� ���ÿ� ������ ��쿡�� ������ �߻��մϴ�)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "��Ű�� ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ�"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "���ġ ����� ���� ��Ű���� ������ ���ġ�Ͽ� ��ġ�մϴ�"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "��Ű���� (����) �����մϴ�"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<����>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "��� ���� ������ �����մϴ�"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "��Ű���� ���Ե� ���� ������ ��ġ���� �ʽ��ϴ�"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "<���>�� ���۵Ǵ� ������ ��ġ���� �ʽ��ϴ� "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<���>"
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "���ġ ����� ���� ��Ű���� ������ ���ġ�Ͽ� ��ġ�մϴ�"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs �� --replacefiles �ɼ��� ���ÿ� ����մϴ�"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "������ ��ġ�� ��Ű���� ���׷��̵� �մϴ�"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<��������>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "��Ű�� ��ġ�� �ؽø�ũ(#)�� ǥ���մϴ� (-v �ɼǰ� �Բ� ����ϴ� ���� ������"
 "��)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "��Ű���� ��Ű���ĸ� �˻����� �ʽ��ϴ�"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "��Ű���� �ü���� �˻����� �ʽ��ϴ�"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "��Ű���� ��ġ�ϱ� ���� ��ũ ������ �˻����� �ʽ��ϴ�"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "��Ű���� ���Ե� ���� ������ ��ġ�մϴ�"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "��Ű���� ��ġ�մϴ�"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "���Ͻý����� �������� �ʰ�, �����ͺ��̽��� �����մϴ�"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "��Ű���� �������� �˻����� �ʽ��ϴ�"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "������ MD5 ���(digest)�� �˻����� �ʽ��ϴ�"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "������ MD5 ���(digest)�� �˻����� �ʽ��ϴ�"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "��� ���� ������ �����մϴ�"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "�������� �ִ� ��Ű���� ��ġ�ϵ��� ��䱸���� �ʽ��ϴ�"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "%%pre ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ� (���� ���)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "%%post ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ� (���� ���)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "%%preun ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ� (���� ���)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "%%postun ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ� (���� ���)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 "�� ��Ű���� ���� �����Ǵ�(triggered) ��� ��ũ��Ʋ��(scriptlet)�� �������� "
 "�ʽ��ϴ�"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "��� %%triggerprein ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ�"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "��� %%triggerin ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ�"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "��� %%triggerun ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ�"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "��� %%triggerpostun ��ũ��Ʋ��(scriptlet)�� �������� �ʽ��ϴ�"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2050,40 +2079,40 @@ msgstr ""
 "���� ������ ��Ű���� �ٿ�׷��̵� �մϴ� (--force �ɼ��� ���ÿ��� �� �ɼ�"
 "�� �ڵ����� ����˴ϴ�)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "��Ű�� ��ġ�� �ۼ�Ʈ(%)�� ǥ���մϴ�"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "���ġ ����� �ִ� ��Ű���� ���, ������ <���丮>�� ���ġ�Ͽ� ��ġ�մϴ�"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<���丮>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "<�������>���� <���ο���>�� ������ ���ġ �մϴ�"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<�������>=<�����>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "��Ű���� �̹� ��ġ�Ǿ� �ִ� ��쿡�� ��ġ�մϴ�"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "��Ű���� ��ġ���� �ʰ�, ����� ��ġ�Ǵ����� Ȯ���մϴ�"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "��Ű���� ���׷��̵� �մϴ�"
 
@@ -2176,10 +2205,6 @@ msgstr "��Ű�� ���� ������ �����մϴ�"
 msgid "skip %%ghost files"
 msgstr "%%ghost ������ �����մϴ�"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "������ ���� ������ ����Ͻʽÿ�"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "������ ������ ����(state)�� �����ݴϴ�"
@@ -2802,34 +2827,34 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "%s(��)�� �� �� ����: %s.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "%s(��)�� fork �� �� ����: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "%s(��)�� fork �� �� ����: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 "%s: %s ��ũ��Ʋ��(scriptlet)�� �����߽��ϴ� (%d), %s-%s-%s(��)�� �����մϴ�\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr ""
 "%2$s-%3$s-%4$s�� %1$s ��ũ��Ʋ��(scriptlet) ���࿡ �����߽��ϴ�, ���� ��Ȳ "
 "%5$d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr ""
@@ -2841,12 +2866,12 @@ msgstr ""
 msgid "Unknown format"
 msgstr "�� �� ���� �±� �Դϴ�"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "��ġ�Ǿ� ���� ����  "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2948,11 +2973,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "����: size(%d)+pad(%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s(��)�� �����߽��ϴ�\n"
@@ -3027,148 +3052,138 @@ msgstr "ǥ������ ���κп� '|' �� �;��մϴ�"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "db%2$d(��)�� �̿��Ͽ� %1$s �ε����� �� �� �����ϴ� - %3$s (%4$d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "db��ΰ� �����Ǿ� ���� �ʽ��ϴ�\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s �ε������� \"%2$s\" ���ڵ带 ��� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "%3$s(��)�� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: Fseek�� �����߽��ϴ�: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: ���µ� �����߽��ϴ�: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: �ջ�� ��� #%u(��)�� ����(retrieved)�Ǿ����ϴ�, �����մϴ�.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr ""
 "%3$s �ε������� \"%2$s\" ���ڵ带 ��� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr ""
 "%3$s �ε������� \"%2$s\" ���ڵ带 ��� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr ""
 "%3$s �ε������� \"%2$s\" ���ڵ带 ��� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x�� ����� ���� �� �����ϴ�\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s �ε������� \"%2$s\" ���ڵ带 ��� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "%3$s(��)�� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "%3$s���� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "���ο� ��Ű���� ��ġ�ϴ� ���� ����(%d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "%3$s(��)�� %2$s ���ڵ带 �����ϴ� ���� ����(%1$d)�� �߻��߽��ϴ�\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "db��ΰ� �����Ǿ� ���� �ʽ��ϴ�"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "�ӽ� �����ͺ��̽� %s(��)�� �̹� �����մϴ�\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "%s ���丮�� �����ϴµ� ������: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "�����ͺ��̽��� ���ڵ� ��ȣ %u(��)�� �߸��Ǿ����ϴ� -- �����մϴ�.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%u�� ó������ ���ڵ带 �߰��� �� �����ϴ�\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "�����ͺ��̽��� �籸���ϴµ� ������: ���� �����ͺ��̽��� �״�� �����˴ϴ�\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "���� �����ͺ��̽��� ���ο� �����ͺ��̽��� ��ü�ϴµ� �����߽��ϴ�!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "�����ϱ� ���� %2$s�� ������ %1$s�� ���Ϸ� ��ü�մϴ�"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s ���丮�� �����ϴµ� ������: %s\n"
@@ -3403,27 +3418,27 @@ msgstr "%s ������ %u ����Ʈ ���� �����ϴ�\n"
 msgid "failed to create directory"
 msgstr "%s ���丮�� �����ϴµ� ������: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "'-' �� ���ڿ����� ����� �� �����ϴ�\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "'-' �� ���ڿ����� ����� �� �����ϴ�\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite�� �����߽��ϴ�: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "�������� ��Ű�� ��ȣ: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek�� �����߽��ϴ�: %s\n"
@@ -3527,12 +3542,30 @@ msgstr "%s: �дµ� �����߽��ϴ�: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "��Ű���� ������ �˻��մϴ�"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps �ɼ��� ��Ű�� ����, ������(rebuild), ��������(recompile), ��ġ, "
+#~ "����, �����ÿ��� ������ �� �ֽ��ϴ�"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) �ɼ��� ��Ű�� ��ġ, ����, ����, �����ͺ��̽� �籸��ÿ��� ����"
+#~ "�� �� �ֽ��ϴ�"
+
+#, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "���ġ ����� ���� ��Ű���� ������ ���ġ�Ͽ� ��ġ�մϴ�"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "�ӽ� �����ͺ��̽� %s(��)�� �̹� �����մϴ�\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "���� �ĺ���(identifier)�� ����Ͽ� ��Ű���� ����/���� �մϴ�"
 
-#~ msgid "query a spec file"
-#~ msgstr "spec ���Ͽ� ���� �����մϴ�"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3542,12 +3575,6 @@ msgstr "��Ű���� ������ �˻��մϴ�"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "��ǥ���(Target) ���� �����÷ο�\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "���� �ɼ�:"
-
-#~ msgid "Database options:"
-#~ msgstr "�����ͺ��̽� �ɼ�:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "������ ������ �����ϴ�\n"
 
diff --git a/po/ms.po b/po/ms.po
index f13fcf2fb..8d1f3c9df 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2008-06-14 00:38+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, fuzzy, c-format
 msgid "RPM version %s\n"
 msgstr "Sejarah versi"
@@ -62,170 +62,162 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr ""
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Senggara dan pertanyaan pangkalan data SQL"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Format Objek Embed"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 #, fuzzy
 msgid "unexpected query source"
 msgstr "Fail Sumber 'Ada' (nama perisian)"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+msgid "only installation and upgrading may be forced"
 msgstr ""
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-
-#: rpmqv.c:239
+#: rpmqv.c:230
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -363,7 +355,7 @@ msgstr ""
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 #, fuzzy
 msgid "override target platform"
 msgstr "Pilih sasaran tandabuku daripada senarai."
@@ -422,94 +414,131 @@ msgstr "Pilih sasaran tandabuku daripada senarai."
 msgid "Building for target %s\n"
 msgstr "&Cari Bantuan"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "memulakan pengkalan data"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "sahkan fail pengkalan data"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+#, fuzzy
+msgid "Database options:"
+msgstr "Pilihan Bina"
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "Lekang Tandatangan OpenPGP"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Pilihan Bina"
+
+#: rpmkeys.c:61 rpmsign.c:143
 #, fuzzy
 msgid "no arguments given"
 msgstr "(tiada cadangan ejaan)"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "Pelihat Pakej"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "Fail Pakej RPM"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+#, fuzzy
+msgid "Signature options:"
+msgstr "Pilihan Bina"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Tidak dapat melaksana %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "Ralat mengimport fail %s"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr ""
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Pilihan Bina"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr ""
 
-#: build/build.c:181
+#: build/build.c:169
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Ralat melaksanakan skrip %s"
 
-#: build/build.c:187
+#: build/build.c:175
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Sambungan Gagal"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:297
+#: build/build.c:290
 #, fuzzy
 msgid ""
 "\n"
@@ -719,44 +748,44 @@ msgstr "Fail %s tidak dijumpai"
 msgid "File not found by glob: %s\n"
 msgstr "Fail pertolongan tidak dijumpai\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Tak dapat membuka fail %s untuk menulis"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "Baris"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Extension &fail:"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, fuzzy, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Mengabaikan rpm buruk: %s"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Bahagian hadapan untuk penciptaan fail audio"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "&Fail Terbaru"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -976,30 +1005,30 @@ msgstr ""
 msgid "no description in %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "Mengabaikan rpm buruk: %s"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "Amaran: tandabuku yang anda berikan [%s] tidak wujud."
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, fuzzy, c-format
 msgid "line %d: Second description\n"
 msgstr "Log penerangan corak"
@@ -1084,97 +1113,97 @@ msgstr ""
 msgid "Unknown icon type: %s\n"
 msgstr "Fail %s adalah dari jenis tidak diketahui"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "Ubah jumlah lajur"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "Tahap kedua..."
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "&Sembunyi nombor baris"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "Cipta dokumen kosong"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "Ubah jumlah lajur"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "Mengabaikan rpm buruk: %s"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "mencapah selepas versi %d daripada %s"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Fail Pakej RPM"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "Fail telah wujud.  Tulisganti fail '%s'?"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "&Sembunyi nombor baris"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "Clip Art tidak boleh dimuatkan"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "Clip Art tidak boleh dimuatkan"
@@ -1233,7 +1262,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Ubah jumlah lajur"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, fuzzy, c-format
 msgid "line %d: second %%prep\n"
 msgstr "&Sembunyi nombor baris"
@@ -1304,31 +1333,31 @@ msgstr "Fail HTML untuk dibuka"
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1375,27 +1404,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Ralat mengira nilai!"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Ralat melaksanakan skrip %s"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Sedang Diguna"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr ""
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "&Fail Terbaru"
@@ -1420,7 +1449,7 @@ msgstr "&Lompat ke hiperlink"
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
@@ -1469,7 +1498,7 @@ msgstr ""
 msgid "Failed to find %s:\n"
 msgstr "Gagal untuk mencari seksyen: %s"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1758,94 +1787,102 @@ msgstr ""
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 #, fuzzy
 msgid "<FILE:...>"
 msgstr "&Fail"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr ""
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "Hantar emel ke senarai"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 #, fuzzy
 msgid "debug rpmio I/O"
 msgstr "Mod nyahpepijat"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, fuzzy, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "Format Senarai Kandungan"
@@ -1868,219 +1905,215 @@ msgstr "Nama item tidak boleh mengandungi '/'"
 msgid "relocations must have a / following the ="
 msgstr "(padan sebarang dari berikut)"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr ""
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 #, fuzzy
 msgid "erase (uninstall) package"
 msgstr "Fail Pakej RPM"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 #, fuzzy
 msgid "<package>+"
 msgstr "Pelihat Pakej"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr ""
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 #, fuzzy
 msgid "<path>"
 msgstr "Laluan"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr ""
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 #, fuzzy
 msgid "install documentation"
 msgstr "Dokumentasi Fedora"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "Pelihat Pakej"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "Terima gantian yang dicadang"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr ""
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr ""
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 #, fuzzy
 msgid "<dir>"
 msgstr "Dir Temp: "
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "&Tetingkap Baru"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "Pelihat Pakej"
@@ -2175,10 +2208,6 @@ msgstr ""
 msgid "skip %%ghost files"
 msgstr "Semua Fail Imej"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr ""
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr ""
@@ -2801,31 +2830,31 @@ msgstr "Sila hubungi %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Tidak dapat membuka %s untuk dibaca: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Tak dapat membuka fail %s."
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Tak dapat membuka fail %s."
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "Gagal untuk mencari seksyen: %s"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "Gagal untuk mencari seksyen: %s"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "Gagal untuk mencari seksyen: %s"
@@ -2835,12 +2864,12 @@ msgstr "Gagal untuk mencari seksyen: %s"
 msgid "Unknown format"
 msgstr "Tidak Diketahui"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "Tiada"
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2942,11 +2971,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Tandatangan: TIDAK DIKETAHUI (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "Gagal"
@@ -3021,142 +3050,132 @@ msgstr "| dijangka pada penghujung ungkapan"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec gagal: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp gagal: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr ""
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr ""
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "pengkalan data sementara %s telah wujud\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "gagal untuk mencipta direktori %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "gagal untuk membuang direktori %s: %s\n"
@@ -3391,27 +3410,27 @@ msgstr ""
 msgid "failed to create directory"
 msgstr "gagal untuk mencipta direktori %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "skrip lua gagal: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "pautan lua gagal: %s\n"
@@ -3514,22 +3533,13 @@ msgstr "%s: gagal membaca manifest: %s\n"
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#, fuzzy
-#~ msgid "query a spec file"
-#~ msgstr "Ralat mengimport fail %s"
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "pengkalan data sementara %s telah wujud\n"
 
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Buffer sasaran melimpah\n"
 
 #, fuzzy
-#~ msgid "Signature options:"
-#~ msgstr "Pilihan Bina"
-
-#, fuzzy
-#~ msgid "Database options:"
-#~ msgstr "Pilihan Bina"
-
-#, fuzzy
 #~ msgid "cannot access file %s\n"
 #~ msgstr "Ralat mengimport fail %s"
 
diff --git a/po/nb.po b/po/nb.po
index 1c8c00777..fec915b1a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -16,7 +16,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versjon %s\n"
@@ -58,123 +58,124 @@ msgstr "feil under lesing av header fra pakke\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kan ikke gjen�pne \"payload\": %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "sp�r/verifiser pakke(r) i gruppe"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 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:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "uventede flagg for sp�rring"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "ventet sp�rringsformat"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "uventet sp�rringskilde"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "kun ett st�rre modi kan spesifiseres"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omplasseres under pakkeinstallasjon"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 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:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenter til --prefix m� begynne med en /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -182,7 +183,7 @@ msgstr ""
 "skript som sl�r av alternativer kan kun spesifiseres under pakkeinstallasjon "
 "og sletting"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -190,42 +191,38 @@ msgstr ""
 "alternativer som sl�r av utl�sing  kan kun spesifiseres under "
 "pakkeinstallasjon, og sletting"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
-msgstr ""
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
+msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
+"alternativer som sl�r av utl�sing  kan kun spesifiseres under "
+"pakkeinstallasjon, og sletting"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "ingen argumenter oppgitt for sp�rring"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "ingen argumenter oppgitt for verifisering"
 
@@ -365,7 +362,7 @@ msgstr ""
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "hopp rett til spesifisert steg (kun for c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr ""
 
@@ -423,95 +420,128 @@ msgstr "Bygger m�lplattformene: %s\n"
 msgid "Building for target %s\n"
 msgstr "Bygger for m�l %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "initier database"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "gjenoppbygg database inverterte lister fra installerte pakkers headere"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr ""
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr ""
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verifiser pakkesignatur"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+msgid "Keyring options:"
+msgstr ""
+
+#: rpmkeys.c:61 rpmsign.c:143
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for sp�rring"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "installer pakke"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signer en pakke (forkast n�v�rende signatur)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "verifiser pakkesignatur"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr ""
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke kj�re %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Skriv inn passord: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Passord er ok.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Passordsjekk feilet\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "sp�rring p� spec-fil"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr ""
+
+#: rpmspec.c:42
+msgid "Spec options:"
+msgstr ""
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Kj�rer(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Kj�ring av %s feilet (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Ugyldig sluttstatus fra %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -714,44 +744,44 @@ msgstr "linje %d: Filnavn ikke tillatt: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "Installerer %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig eier/gruppe: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "ingen pakke utl�ser %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "kan ikke aksessere fil %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -973,30 +1003,30 @@ msgstr ""
 msgid "no description in %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linje %d: Ugyldig flagg %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr ""
@@ -1081,97 +1111,97 @@ msgstr "Kan ikke lese ikon %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Ukjent ikontype: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, 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:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "linje %d: Ugyldig tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "linje %d: Ugyldig tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "linje %d: Ugyldig tegn '-' i %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linje %d: Feilutformet tagg: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linje %d: Tom tagg: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, 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:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linje %d: Docdir m� begynne med '/': %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "linje %d: Epoch/serienummer m� v�re et tall: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linje %d: Ugyldig %s: kvalifikatorer: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linje %d: Ugyldig BuildArchitecture format: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern feil: Ugyldig tag %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "linje %d: Versjon kreves: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Ugyldig pakkespesifikasjon: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakke eksisterer allerede: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linje %d: Ukjent tagg: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot kan ikke v�re \"/\": %s\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot kan ikke v�re \"/\": %s\n"
@@ -1231,7 +1261,7 @@ msgstr "%s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linje %d: %%prep for andre gang\n"
@@ -1304,31 +1334,31 @@ msgstr "Kan ikke �pne %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "�pen %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerer %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else uten %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif uten %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "ugyldig %%include utsagn\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen kompatible arkitekturer funnet for bygging\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakken har ingen %%description: %s\n"
@@ -1375,27 +1405,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Feil under lesing av %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Kj�rer(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Mangler '(' i %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "For mange argumenter i datalinje ved %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "kan ikke aksessere fil %s\n"
@@ -1420,7 +1450,7 @@ msgstr "Kunne ikke kj�re %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunne ikke kj�re %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
@@ -1469,7 +1499,7 @@ msgstr "Fil %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Klarte ikke � finne %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1745,98 +1775,106 @@ msgstr ""
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "skriv ut makroutvidelsen av <uttr>+"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "les <fil:...> i stedet for standard makrofil(er)"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "ikke verifiser pakkearkitektur"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verifiser pakkesignatur"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "send stdout til <kmd>"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "bruk <katalog> som toppniv�katalog"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "vis kjente tagger for sp�rring"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "vis endelig rpmrc og makrokonfigurasjon"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "gi mindre detaljert info"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "gi mer detaljert info"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "skriv ut hvilken versjon av rpm som brukes"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "feils�k rpmio I/U"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1857,16 +1895,16 @@ msgstr "relokasjoner m� inneholde et ="
 msgid "relocations must have a / following the ="
 msgstr "relokasjoner m� ha et / etter ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "sp�r/verifiser pakke(r) i gruppe"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1874,166 +1912,161 @@ msgstr ""
 "fjern alle pakker som er lik <pakke> (normalt vil en feil genereres hvis "
 "<pakke> spesifiserer flere pakker)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "ikke kj�r pakkespesifikke skriptlet"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "omplasser filer i ikke-omplasserbar pakke"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "slett (avinstaller) pakke"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<pakke>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "ikke installer dokumentasjon"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "ikke installer dokumentasjon"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "hopp over filer med innledende komponent <sti> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<sti>"
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "omplasser filer i ikke-omplasserbar pakke"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "forkortning for --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "oppgrader pakke(r) hvis allerede installert"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<pakkefil>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "skriv ut skigarder etter som pakken installeres (nyttig med -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "ikke verifiser pakkearkitektur"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "ikke verifiser operativsystem for pakken"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "ikke sjekk diskplass f�r installasjon"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "installer dokumentasjon"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "installer pakke"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "oppdater databasen, men ikke modifiser filsystemet"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "ikke verifiser st�rrelse p� filer"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "ikke verifiser st�rrelse p� filer"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "ikke installer dokumentasjon"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ikke ordne pakkeinstallasjon for � tilfredsstille avhengigheter"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "ikke kj�r noen %%pre skriptlet (hvis noen)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "ikke kj�r %%post skriptlet (hvis noen)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "ikke kj�r %%preun skriptlet (hvis noen)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "ikke kj�r %%postun skriptlet (hvis noen)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 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:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "ikke kj�r %%triggerprein skriptlets"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "ikke kj�r %%triggerin skriptlets"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "ikke kj�r %%triggerun skriplets"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "ikke kj�r %%triggerpostun skriptlets"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2041,39 +2074,39 @@ msgstr ""
 "oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gj�r "
 "dette automatisk)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<kat>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "omplasser filer fra sti <gml> til <ny>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<gml>=<ny>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "reinstaller selv om pakken allerede er installert"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "oppgrader pakke(r)"
 
@@ -2169,10 +2202,6 @@ msgstr ""
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr ""
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr ""
@@ -2790,31 +2819,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s: Fwrite feilet: %s\n"
@@ -2824,12 +2853,12 @@ msgstr "%s: Fwrite feilet: %s\n"
 msgid "Unknown format"
 msgstr "Ukjent filtype"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "ikke installert"
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2931,11 +2960,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s feilet\n"
@@ -3017,142 +3046,132 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, 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"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: �pne feilet: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr ""
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3387,27 +3406,27 @@ msgstr "Fil %s er mindre enn %u bytes\n"
 msgid "failed to create directory"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "- ikke st�ttet for strenger\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- ikke st�ttet for strenger\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
@@ -3511,12 +3530,13 @@ msgid "don't verify header+payload signature"
 msgstr "verifiser pakkesignatur"
 
 #, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "omplasser filer i ikke-omplasserbar pakke"
+
+#, fuzzy
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "sp�r/verifiser pakke(r) som eier fil"
 
-#~ msgid "query a spec file"
-#~ msgstr "sp�rring p� spec-fil"
-
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Overflyt i m�lbuffer\n"
 
diff --git a/po/nl.po b/po/nl.po
index 1f84cef6c..8e8776daa 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2008-09-03 22:17+0200\n"
 "Last-Translator: Peter van Egdom <p.van.egdom@gmail.com>\n"
 "Language-Team: Dutch <fedora-trans-list@redhat.com>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versie %s\n"
@@ -63,167 +63,159 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr ""
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+msgid "only installation and upgrading may be forced"
 msgstr ""
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-
-#: rpmqv.c:239
+#: rpmqv.c:230
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -359,7 +351,7 @@ msgstr ""
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr ""
 
@@ -416,90 +408,125 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr ""
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr ""
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Database opties:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr ""
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Database opties:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr ""
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 msgid "sign package(s)"
 msgstr ""
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr ""
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+#, fuzzy
+msgid "Signature options:"
+msgstr "Database opties:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+msgid "query spec file(s)"
+msgstr ""
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr ""
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Database opties:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr ""
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -699,44 +726,44 @@ msgstr "Glob niet toegestaan: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "regel: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "bestand %s: %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -955,30 +982,30 @@ msgstr ""
 msgid "no description in %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr ""
@@ -1063,97 +1090,97 @@ msgstr ""
 msgid "Unknown icon type: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr ""
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr ""
@@ -1212,7 +1239,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1283,31 +1310,31 @@ msgstr ""
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1353,27 +1380,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "bestand %s: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr ""
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Ontbrekende %s in %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr ""
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "bestand %s: %s\n"
@@ -1398,7 +1425,7 @@ msgstr ""
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
@@ -1447,7 +1474,7 @@ msgstr ""
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1720,91 +1747,99 @@ msgstr ""
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<BESTAND:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr ""
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr ""
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1825,211 +1860,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr ""
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<pakket>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr ""
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<pad>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr ""
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<pakketbestand>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr ""
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr ""
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -2118,10 +2149,6 @@ msgstr ""
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr ""
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr ""
@@ -2729,31 +2756,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr ""
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr ""
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr ""
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr ""
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr ""
@@ -2763,12 +2790,12 @@ msgstr ""
 msgid "Unknown format"
 msgstr "Onbekend"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(geïnstalleerd) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2869,11 +2896,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr " mislukt - "
@@ -2948,142 +2975,132 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr ""
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr ""
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr ""
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3315,27 +3332,27 @@ msgstr ""
 msgid "failed to create directory"
 msgstr ""
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr ""
@@ -3437,9 +3454,6 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#~ msgid "Database options:"
-#~ msgstr "Database opties:"
-
 #~ msgid "readRPM: open %s: %s\n"
 #~ msgstr "readRPM: open %s: %s\n"
 
diff --git a/po/pl.po b/po/pl.po
index d61ee16fd..0ba35f2ed 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2010-10-23 12:05+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM wersja %s\n"
@@ -66,125 +66,126 @@ msgstr "błąd podczas odczytywania nagłówka z pakietu\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "nie można ponownie otworzyć danych: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr "Odpytanie/sprawdzenie opcji wyboru pakietów:"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Opcje zapytania (z -q lub --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Opcje sprawdzania (z -V lub --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opcje instalacji/aktualizacji/usuwania:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Wspólne opcje dla wszystkich trybów i plików binarnych RPM:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 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:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "nieoczekiwane flagi zapytania"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "nieoczekiwany format zapytania"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "nieoczekiwane źródło zapytania"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "może być podany tylko jeden główny tryb pracy"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "tylko instalację, aktualizowanie i usuwanie źródeł oraz plików spec można "
 "wymusić"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "pliki mogą być przenoszone tylko podczas instalacji pakietu"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "nie można użyć --prefix z --relocate lub --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate i --excludepath można użyć tylko podczas instalowania nowych "
 "pakietów"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix można użyć tylko podczas instalowania nowych pakietów"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametry dla --prefix muszą zaczynać się od /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "nie można jednocześnie podać --excludedocs i --includedocs"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches można podać tylko podczas usuwania pakietów"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles można podać tylko podczas instalacji pakietów"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb można podać tylko podczas instalacji i usuwania pakietów"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -192,7 +193,7 @@ msgstr ""
 "opcje wyłączające skrypty można podać tylko podczas instalacji i usuwania "
 "pakietów"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -200,46 +201,36 @@ msgstr ""
 "opcje wyłączające wyzwalacze można podać tylko podczas instalacji i usuwania "
 "pakietów"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps można podać tylko podczas budowania, przebudowywania, ponownej "
-"kompilacji, instalacji, usuwania i sprawdzania pakietów"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test można podać tylko podczas instalacji, usuwania i budowania pakietów"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) można podać tylko podczas instalacji, usuwania, sprawdzania "
-"pakietów i przebudowywania bazy"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb można podać tylko podczas instalacji i usuwania pakietów"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametry dla --root (-r) muszą zaczynać się od /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "nie podano pakietów do usunięcia"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "nie podano pakietów do zainstalowania"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "nie podano parametrów dla zapytania"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "nie podano parametrów dla sprawdzenia"
 
@@ -382,7 +373,7 @@ msgstr "usunięcie pliku spec po ukończeniu"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "przejście od razu do podanego etapu (tylko dla c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "zastąpienie platformy docelowej"
 
@@ -439,92 +430,125 @@ msgstr "Budowanie dla platform docelowych: %s\n"
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "zainicjowanie bazy danych"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "przebudowanie odwrotne listy w bazie danych z nagłówków zainstalowanych "
 "pakietów"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "sprawdzenie plików bazy danych"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr ""
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "sprawdzenie podpisów pakietów"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "zaimportowanie opakowanego klucza publicznego"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr "wyświetlenie listy kluczy z bazy kluczy RPM"
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+msgid "Keyring options:"
+msgstr ""
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "nie podano parametrów"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 msgid "sign package(s)"
 msgstr "podpisanie pakietów"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podpisanie pakietów (identyczne z --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "usunięcie podpisów pakietów"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr ""
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie można wykonać %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Należy ustawić \"%%_gpg_name\" w pliku makr\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Proszę podać hasło: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Hasło jest dobre.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Sprawdzenie hasła nie powiodło się\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "sprawdzenie plików bazy danych"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "użycie następującego formatu zapytania"
+
+#: rpmspec.c:42
+msgid "Spec options:"
+msgstr ""
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Nie można otworzyć pliku tymczasowego.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Wykonywanie(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Wykonanie %s nie powiodło się (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Błędny stan wyjścia z %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -727,32 +751,32 @@ msgstr "Wyrażenie regularne jest niedozwolone: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Nie odnaleziono pliku przez wyrażenie regularne: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Nie można otworzyć pliku %s dla %%files: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "wiersz: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Błędny plik: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Błędny właściciel/grupa: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Sprawdzanie niespakietowanych plików: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -761,12 +785,12 @@ msgstr ""
 "Odnaleziono zainstalowane (ale niespakietowane) pliki:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Przetwarzanie plików: %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Pliki binarne zależne od architektury w pakiecie noarch\n"
 
@@ -985,30 +1009,30 @@ msgstr "brak nazwy w %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "brak opisu w %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "wiersz %d: błąd podczas przetwarzania %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "wiersz %d: błędna opcja %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "wiersz %d: za dużo nazw: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "wiersz %d: pakiet nie istnieje: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "wiersz %d: drugi opis\n"
@@ -1093,97 +1117,97 @@ msgstr "Nie można odczytać ikony %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Nieznany typ ikony: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "wiersz %d: znacznik przyjmuje tylko jeden token: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "wiersz %d: niedozwolony znak \"%c\" w: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "wiersz %d: niedozwolony znak w: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "wiersz %d: niedozwolona sekwencja \"..\" w: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "wiersz %d: błędnie sformowany znacznik: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "wiersz %d: pusty znacznik: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "wiersz %d: przedrostki nie mogą kończyć się na \"/\": %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "wiersz %d: Docdir musi zaczynać się od \"/\": %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "wiersz %d: pole Epoch musi być niepodpisaną liczbą: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "wiersz %d: błędne określenia %s: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "wiersz %d: błędny format BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "wiersz %d: obsługiwane są tylko podpakiety noarch: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Wewnętrzny błąd: fałszywy znacznik %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "wiersz %d: %s jest przestarzałe: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Błędna specyfikacja pakietu: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Pakiet już istnieje: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "wiersz %d: nieznany znacznik: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} nie może być puste\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} nie może być \"/\"\n"
@@ -1242,7 +1266,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Nieprawidłowy numer łaty %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "wiersz %d: drugie %%prep\n"
@@ -1315,31 +1339,31 @@ msgstr "Nie można otworzyć %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Niezamknięte %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean zwróciło %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: napotkano %%else bez %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: napotkano %%endif bez %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "błędnie sformowany wpis %%include\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Nie odnaleziono zgodnych architektur do zbudowania\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakiet nie posiada %%description: %s\n"
@@ -1387,27 +1411,27 @@ msgstr ""
 "Typ \"%s\" został podany razem z innymi typami w %%semodule %s. "
 "Kompaktowanie typów do \"%s\".\n"
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Błąd podczas przetwarzania %s: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Oczekiwano znacznika %%semodule: %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Brak ścieżki do modułu w wierszu: %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Za dużo parametrów w wierszu: %s\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, c-format
 msgid "Processing policies: %s\n"
 msgstr "Przetwarzanie polityk: %s\n"
@@ -1432,7 +1456,7 @@ msgstr "Nie można wykonać chdir do %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie można wykonać %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie można rozdzielić %s: %s\n"
@@ -1481,7 +1505,7 @@ msgstr "Wyszukiwanie %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Odnalezienie %s nie powiodło się:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "odpytanie pliku spec %s nie powiodło się, nie można przetworzyć\n"
@@ -1750,91 +1774,99 @@ msgstr ""
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nieobsługiwane dane (%s) w pakiecie %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "wcześniejsze określenie MAKRA z wartością WYRAŻENIE"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "\"MAKRO WYRAŻENIE\""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "określenie MAKRA z wartością WYRAŻENIE"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "wyświetlenie rozwinięcia makr z WYRAŻENIA"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "\"WYRAŻENIE\""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "odczytanie <PLIK:...> zamiast domyślnych plików"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<PLIK:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "bez sprawdzania skrótów pakietów"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "bez sprawdzania nagłówków bazy danych po pobraniu"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "bez sprawdzania podpisów pakietów"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "przekazanie standardowego wyjścia do POLECENIA"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "POLECENIE"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "użycie ROOTA jako katalogu najwyższego poziomu"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "wyświetlenie znanych znaczników zapytań"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "wyświetlenie ostatecznej konfiguracji rpmrc i makr"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "użycie mniej szczegółowego wyjścia"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "użycie bardziej szczegółowego wyjścia"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "wyświetlenie wersji używanego oprogramowania RPM"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "debugowanie maszyny stanu danych pliku"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "debugowanie wejścia/wyjścia rpmio"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabela opcji jest błędnie skonfigurowana (%d)\n"
@@ -1855,17 +1887,17 @@ msgstr "przesunięcia muszą zawierać ="
 msgid "relocations must have a / following the ="
 msgstr "przesunięcia muszą zawierać / po ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "dodanie sugerowanych pakietów do transakcji"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "zainstalowanie wszystkich plików, nawet konfiguracyjnych, które w innym "
 "przypadku by pominięto"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1873,159 +1905,155 @@ msgstr ""
 "usunięcie wszystkich pakietów, które zgadzają się z <pakietem> (zwykle "
 "tworzony jest błąd, jeśli <pakiet> podaje wiele pakietów)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "bez wykonania skryptów pakietów"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "przesunięcie plików w nieprzesuwalnym pakiecie"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "wyświetlenie pętli zależności jako ostrzeżenie"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "usunięcie (odinstalowanie) pakietu"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<pakiet>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "bez instalacji plików konfiguracyjnych"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "bez instalacji dokumentacji"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "pominięcie plików zaczynających się od składnika <ścieżki> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<ścieżka>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "wykrywanie konfliktów plików między pakietami"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skrócona wersja --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "zaktualizowanie pakietów, jeśli są już zainstalowane"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<plik_pakietu>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "wyświetlenie krzyżyków podczas instalacji pakietów (dobre z -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "bez sprawdzania architektury pakietu"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "bez sprawdzania systemu operacyjnego pakietu"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "bez sprawdzania pojemności dysku przed zainstalowaniem"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "zainstalowanie dokumentacji"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "zainstalowanie pakietów"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "zaktualizowanie bazy danych, ale bez modyfikacji systemu plików"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "bez sprawdzania zależności pakietu"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr "bez sprawdzania skrótów plików"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr "bez sprawdzania skrótów plików (przestarzałe)"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "bez instalacji kontekstów bezpieczeństwa plików"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "bez zmieniania kolejności instalacji pakietów, aby zapewnić zależności"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "bez sugerowania sposobów spełnienia brakujących zależności"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "bez wykonania skryptu %%pre (jeśli jest)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "bez wykonania skryptu %%post (jeśli jest)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "bez wykonania skryptu %%preun (jeśli jest)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "bez wykonania skryptu %%postun (jeśli jest)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "bez wykonania żadnych skryptów wyzwalanych przez ten pakiet"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "bez wykonania żadnych skryptów %%triggerprein"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "bez wykonania żadnych skryptów %%triggerin"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "bez wykonania żadnych skryptów %%triggerun"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "bez wykonania żadnych skryptów %%triggerpostun"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr "bez wykonywania żadnych działań kolekcji"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2033,39 +2061,39 @@ msgstr ""
 "zaktualizowanie do poprzedniej wersji pakietu (--force podczas "
 "aktualizowania robi to automatycznie)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "wyświetlenie stanu instalacji pakietu w procentach"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "przesunięcie pakietu do <katalogu>, jeśli jest przesuwalny"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<katalog>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "przesunięcie plików z <poprzedniej> ścieżki do <nowej>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<poprzednia>=<nowa>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "zignorowanie konfliktów plików między pakietami"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "zainstalowanie ponownie, jeśli pakiet jest już zainstalowany"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "bez instalacji, podanie tylko czy instalacja zadziała czy nie"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "zaktualizowanie pakietów"
 
@@ -2154,10 +2182,6 @@ msgstr "wyświetlenie listy plików pakietu"
 msgid "skip %%ghost files"
 msgstr "pominięcie plików %%ghost"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "użycie następującego formatu zapytania"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "wyświetlenie stanu wyświetlonych plików"
@@ -2767,31 +2791,31 @@ msgstr "Proszę skontaktować się z %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Nie można otworzyć %s do odczytania: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "Obsługa skryptów <lua> nie jest wbudowana\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Nie można utworzyć pliku tymczasowego dla %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Nie można utworzyć kopii deskryptora pliku: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "Skrypt %s nie powiódł się, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "Skrypt %s nie powiódł się, sygnał %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "Skrypt %s nie powiódł się, stan wyjścia %d\n"
@@ -2800,11 +2824,11 @@ msgstr "Skrypt %s nie powiódł się, stan wyjścia %d\n"
 msgid "Unknown format"
 msgstr "Nieznany format"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 msgid "install"
 msgstr "instalacja"
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr "usunięcie"
 
@@ -2905,11 +2929,11 @@ msgstr "Sprawdzenie podpisu: BŁĘDNE PARAMETRY\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpis: NIEZNANY (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr "pominięto"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "failed"
 msgstr "nie powiodło się"
 
@@ -2983,144 +3007,134 @@ msgstr "oczekiwano | na końcu wyrażenia"
 msgid "array iterator used with different sized arrays"
 msgstr "iterator tablicy użyty na tablicach o różnych rozmiarach"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr "Tworzenie %d brakujących indeksów, proszę czekać...\n"
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: API bazy danych %d jest niedostępne\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nie można otworzyć indeksu %s używając bazy danych%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "ścieżka bazy danych nie została ustawiona\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "błąd(%d) podczas otrzymywania wpisów \"%s\" z indeksu %s\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: pomijanie"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "błąd(%d) podczas zapisywania wpisu #%d do %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec nie powiodło się: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp nie powiodło się: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: pomijanie"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: pobrano uszkodzony nagłówek #%u - pomijanie.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "błąd(%d:%s) podczas pobierania następnego klucza z indeksu %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "błąd(%d) podczas dodawania wpisu nagłówka #%d\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "błąd(%d) podczas usuwania wpisu nagłówka #%d\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: nie można odczytać nagłówka pod 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "błąd(%d) podczas ustawiania wpisów \"%s\" z indeksu %s\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "błąd(%d) podczas zapisywania wpisu \"%s\" do %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "błąd(%d) usuwania wpisu \"%s\" z %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "błąd(%d) podczas przydzielania nowej instancji pakietu\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "błąd(%d) podczas zapisywania wpisu %s do %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "ścieżka bazy danych nie została ustawiona"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "tymczasowa baza danych %s już istnieje\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "utworzenie katalogu %s nie powiodło się: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "nagłówek #%u w bazie danych jest błędny - pomijanie.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie można dodać wpisu będącego oryginalnie przy %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "przebudowanie bazy danych nie powiodło się: oryginalna baza danych pozostała "
 "na miejscu\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana poprzedniej bazy danych na nową nie powiodła się.\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, 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"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
@@ -3358,27 +3372,27 @@ msgstr "Plik %s jest mniejszy niż %u bajtów\n"
 msgid "failed to create directory"
 msgstr "utworzenie katalogu nie powiodło się"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "nieprawidłowa składnia skryptu Lua: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "nieprawidłowa składnia skryptu Lua: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "skrypt Lua nie powiódł się: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "nieprawidłowa składnia pliku Lua: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "hak Lua nie powiódł się: %s\n"
@@ -3478,3 +3492,26 @@ msgstr "%s: odczytanie manifestu nie powiodło się: %s\n"
 #: tools/rpmgraph.c:220
 msgid "don't verify header+payload signature"
 msgstr "bez sprawdzania podpisu nagłówka+danych"
+
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps można podać tylko podczas budowania, przebudowywania, ponownej "
+#~ "kompilacji, instalacji, usuwania i sprawdzania pakietów"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) można podać tylko podczas instalacji, usuwania, sprawdzania "
+#~ "pakietów i przebudowywania bazy"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "wykrywanie konfliktów plików między pakietami"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: API bazy danych %d jest niedostępne\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "tymczasowa baza danych %s już istnieje\n"
diff --git a/po/pt.po b/po/pt.po
index d8c0f4974..4b5d1f203 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -16,7 +16,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versão %s\n"
@@ -58,127 +58,128 @@ msgstr "erro ao ler o cabeçalho do pacote\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "não consigo aceder de novo ao conteúdo: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "pesquisar/verificar o(s) pacote(s) no grupo"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Opções de pesquisa (com o -q ou o --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Opções de verificação (com o -V ou o --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opções de Instalação/Actualização/Remoção:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opções comuns para todos os modos do rpm:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 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:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "opções de pesquisa inesperadas"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "formato de pesquisa inesperado"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "origem de pesquisa inesperada"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "só pode ser especificado um 'major mode'"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "só a instalação, a actualização, o rmsource e o rmpspec podem ser forçados"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 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:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 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:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "o --prefix só pode ser usado ao instalar pacotes novos"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "os argumentos do --prefix têm de começar por /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 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:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "o --percent só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "o --replacepkgs só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "o --excludedocs  só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "o --includedocs  só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "só uma das opções --excludedocs e --includedocs pode ser usada"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "o --ignorearch só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "o --ignoreos só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "o --ignoresize só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "o --allmatches só pode ser indicado ao apagar o pacote"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "o --allfiles só pode ser indicado durante a instalação do pacote"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 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:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -186,7 +187,7 @@ msgstr ""
 "a desactivação de 'scripts' só pode ser indicado durante a instalação ou a "
 "remoção de pacotes"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -194,47 +195,38 @@ msgstr ""
 "a desactivação dos 'triggers' só pode ser usado durante a instalação ou "
 "remoção de pacotes"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-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:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "o --test só pode ser indicado durante a instalação, remoção ou criação do "
 "pacote"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 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"
+"o --justdb só pode ser indicado durante a instalação ou a remoção do pacote"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "os argumentos do --root (-r) têm de começar por /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "não foram indicados pacotes para apagar"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "não foram indicados pacotes para instalar"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "não foram indicados argumentos para a pesquisa"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "não foram indicados argumentos para a verificação"
 
@@ -378,7 +370,7 @@ msgstr "apagar o ficheiro spec quando acabar"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "saltar directamente para a etapa indicada (só para c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "ignorar a plataforma-alvo"
 
@@ -436,97 +428,132 @@ msgstr "A construir plataformas alvo: %s\n"
 msgid "Building for target %s\n"
 msgstr "A construir para o alvo %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "inicializar a base de dados"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "reconstruir as listas invertidas da base dados com os cabeçalhos dos pacotes "
 "instalados"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "verificar ficheiros da base de dados"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Opções da base de dados:"
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verificar a assinatura do pacote"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Opções de assinatura:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 #, fuzzy
 msgid "no arguments given"
 msgstr "não foram indicados argumentos para a pesquisa"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "instala o pacote"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "assinar um pacote (retira a assinatura actual)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "verificar a assinatura do pacote"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Opções de assinatura:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Não consegui executar %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Precisa definir o \"%%_gpg_name\" no seu ficheiro de macros\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Indique a palavra-chave: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "A palavra-chave está correcta.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "A verificação da palavra-chave falhou\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "pesquisar um ficheiro spec"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "usar o formato de pesquisa seguinte"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Opções de assinatura:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Não consegui abrir um ficheiro temporário.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "A executar(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "A execução de %s falhou (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Código de saída inválido do %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -729,44 +756,44 @@ msgstr "Glob não permitido: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Ficheiro não encontrado pelo glob: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ficheiro inválido: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Dono/grupo inválido: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "A processar os ficheiros: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -987,30 +1014,30 @@ msgstr "falta o nome no %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "falta a descrição no %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linha %d: Erro ao analisar a %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linha %d: Opção inválida %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "linha %d: Demasiados nomes: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "linha %d: O pacote não existe: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "linha %d: Segunda descrição\n"
@@ -1095,97 +1122,97 @@ msgstr "Não consegui ler o ícone %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Tipo de ícone desconhecido: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, 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:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "linha %d: Carácter '-' ilegal no %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "linha %d: Carácter '-' ilegal no %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "linha %d: Carácter '-' ilegal no %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "Linha %d: Opção inválida: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linha %d: Opção em branco: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, 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:747
+#: build/parsePreamble.c:722
 #, 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:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "linha %d: O campo Epoch/Serial tem de ser um número: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linha %d: Qualificadores %s: inválidos: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linha %d: Formato da BuildArchitecture inválido: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Erro interno: Opção esquisita %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "linha %d: Necessária a versão: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Descrição do pacote inválida: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "O pacote já existe: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linha %d: Opção desconhecida: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "O BuildRoot não pode ser o \"/\": %s\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "O BuildRoot não pode ser o \"/\": %s\n"
@@ -1245,7 +1272,7 @@ msgstr "%s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linha %d: segundo %%prep\n"
@@ -1318,31 +1345,31 @@ msgstr "Incapaz de aceder ao %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "%%if não fechado\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: o parseExpressionBoolean devolve %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, 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:368
+#: build/parseSpec.c:359
 #, 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:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "instrução %%include desorganizada\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Não foram encontradas arquitecturas compatíveis para as quais criar\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote não tem uma %%description: %s\n"
@@ -1389,27 +1416,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Erro ao analisar o %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "A executar(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Falta um %s em %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Demasiados argumentos na linha de dados em %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "A processar os ficheiros: %s-%s-%s\n"
@@ -1434,7 +1461,7 @@ msgstr "Não consegui executar o %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Não consegui executar o %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Não consegui executar à parte o %s: %s\n"
@@ -1484,7 +1511,7 @@ msgstr "A procurar o %s: (usando o %s)...\n"
 msgid "Failed to find %s:\n"
 msgstr "Não consegui encontrar o %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "a pesquisa do ficheiro spec %s falhou, não consigo analisar\n"
@@ -1764,99 +1791,107 @@ msgstr "o %s não pode ser instalado\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "imprimir a expansão da macro <expr>+"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 #, 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:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "não verificar as dependências do pacote"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "não verifica a arquitectura do pacote"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "verificar a assinatura do pacote"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "manda o stdout para <cmd>"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "usa <dir> como a directoria de topo"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "mostrar as opções de pesquisa conhecidas"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "mostra a configuração final do rpmrc e das macros"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "devolver um resultado menos detalhado"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "devolver um resultado mais detalhado"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "imprime a versão do RPM que está a usar"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "depurar máquina de estados de ficheiros"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "depurar a E/S da rpmio"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1877,18 +1912,18 @@ msgstr "os novos locais têm de conter um ="
 msgid "relocations must have a / following the ="
 msgstr "os novos locais têm de ter um / a seguir ao ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "pesquisar/verificar o(s) pacote(s) de transacção de instalação"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1896,167 +1931,162 @@ msgstr ""
 "remove todos os pacotes que correspondam a <pacote> (normalmente aparece um "
 "erro se o <pacote> especifica vários pacotes)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "não executar nenhuns scripts do pacote"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "muda os ficheiros de sítio num pacote de localização fixa"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "apaga (desinstala) o pacote"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<pacote>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "listar todos os ficheiros de configuração"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "não instala a documentação"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "ignorar os ficheiros com a componente inicial <dir> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<caminho>"
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "muda os ficheiros de sítio num pacote de localização fixa"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "abreviatura para --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "actualizar o pacote(s) se já estiver instalado"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<pacote>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "mostra cardinais enquanto o pacote instala (conveniente com o -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "não verifica a arquitectura do pacote"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "não verifica o sistema operativo do pacote"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "não verifica o espaço em disco antes de instalar"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "instala a documentação"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "instala o pacote"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 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:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "não verifica as dependências do pacote"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "não verificar o MD5 dos ficheiros"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "não verificar o MD5 dos ficheiros"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "listar todos os ficheiros de configuração"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 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:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "não executar o script %%pre (se existir)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "não executar o script %%post (se existir)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "não executar o script %%preun (se existir)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "não executar o script %%postun (se existir)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 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:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "não executar nenhum dos scripts %%triggerprein"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "não executar nenhum dos scripts %%triggerin"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "não executar nenhum dos scripts %%triggerun"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "não executar nenhum dos scripts %%triggerpostun"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2064,39 +2094,39 @@ msgstr ""
 "actualiza para um versão antiga do pacote (o --force faz isto "
 "automaticamente)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "mostra percentagens enquanto o pacote instala"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "muda o pacote para <dir>, se for possível"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "muda os ficheiros de <velho> para <novo>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<velho>=<novo>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "reinstalar se o pacote já estiver presente"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "actualizar pacote(s)"
 
@@ -2189,10 +2219,6 @@ msgstr "listar os ficheiros no pacote"
 msgid "skip %%ghost files"
 msgstr "ignorar ficheiros %%ghost"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "usar o formato de pesquisa seguinte"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "mostrar os estados dos ficheiros listados"
@@ -2817,32 +2843,32 @@ msgstr "Por favor contacte o %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Não consegui abrir o %s para leitura: %s.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Não consegui executar à parte o %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Não consegui executar à parte o %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr ""
 "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr ""
@@ -2853,12 +2879,12 @@ msgstr ""
 msgid "Unknown format"
 msgstr "opção desconhecida"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "não instalado "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2960,11 +2986,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "O %s falhou\n"
@@ -3039,143 +3065,133 @@ msgstr "esperado um | no fim da expressão"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, 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"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "não foi definido o dbpath\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: O Fseek falhou: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: o acesso falhou: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, fuzzy, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: recebida instância do cabeçalho #%u estragada, a ignorar.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: não consigo ler o cabeçalho em 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, 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"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erro(%d) ao remover o registo %s do %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erro(%d) ao criar uma nova instância do pacote\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "não foi definido o dbpath"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "A base de dados temporária %s já existe\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "falhou a remoção da directoria %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, 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"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "não consigo adicionar o registo originalmente em %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 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"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "falhou a substituição da base de dados antiga pela nova!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, 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"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falhou a remoção da directoria %s: %s\n"
@@ -3410,27 +3426,27 @@ msgstr "O ficheiro %s tem menos de %u bytes\n"
 msgid "failed to create directory"
 msgstr "falhou a remoção da directoria %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "- não suportado em cadeias de caracteres\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- não suportado em cadeias de caracteres\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: O fwrite falhou: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: O Fseek falhou: %s\n"
@@ -3534,12 +3550,30 @@ msgstr "%s: a leitura do manifesto falhou: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verificar a assinatura do pacote"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "o --nodeps só pode ser indicado durante a criação, reconstrução, "
+#~ "recompilação, instalação, remoção ou verificação do pacote"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ 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"
+
+#, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "muda os ficheiros de sítio num pacote de localização fixa"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "A base de dados temporária %s já existe\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do ficheiro"
 
-#~ msgid "query a spec file"
-#~ msgstr "pesquisar um ficheiro spec"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3549,12 +3583,6 @@ msgstr "verificar a assinatura do pacote"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Sobrecarga do tampão de destino\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Opções de assinatura:"
-
-#~ msgid "Database options:"
-#~ msgstr "Opções da base de dados:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "não existem ficheiros a assinar\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5dfb96914..a3e1e7e7c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2010-09-13 10:11-0300\n"
 "Last-Translator: Taylon <taylon@taylon.eti.br>\n"
 "Language-Team: Brazilian Portuguese <trans-pt_br@lists.fedoraproject.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versão %s\n"
@@ -69,137 +69,138 @@ msgstr "erro ao ler o cabeçalho do pacote\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "Não foi possível reabrir a carga útil: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr "Consultar/Verificar as opções de seleção do pacote:"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Opções de consulta (com -q ou --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Opções de verificação (com -V ou --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opções de Instalação/Atualização/Remoção:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opções comuns para todos os executáveis e modos rpm:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "somente um tipo de consulta/verificação pode ser feita por vez"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "sinalizador de consulta não esperado"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "formato de consulta não esperado"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "fonte de pesquisa não esperada"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "somente um modo principal pode ser especificado"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "somente a instalação, atualização, rmsource e rmspec podem ser forçados"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr ""
 "os arquivos somente podem ser realocados durante a instalação de pacotes"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "não é possível usar --prefix com --relocate ou --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate e --excludepath somente podem ser usados na instalação de novos "
 "pacotes"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix somente pode ser usado na instalação de novos pacotes"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumentos para --prefix devem começar com uma /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) somente pode ser especificado durante instalação de pacotes"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "--percent somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs somente pode ser especificado durante instalação de pacotes"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs somente pode ser especificado durante instalação de pacotes"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--ignoreos somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--ignoresize somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches somente pode ser especificado durante a remoção de pacotes"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--allfiles somente pode ser especificado durante a instalação de pacotes"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb somente pode ser especificado durante a instalação ou remoção de "
 "pacotes"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -207,7 +208,7 @@ msgstr ""
 "opções de desativação de scripts somente podem ser especificadas durante a "
 "instalação ou remoção de pacotes"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -215,47 +216,39 @@ msgstr ""
 "opções de desativação de disparador somente podem ser especificadas durante "
 "a instalação ou remoção de pacotes"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps somente pode ser especificado durante a construção, reconstrução, "
-"recompilação, instalação, remoção ou verificação de pacotes"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test somente pode ser especificado durante a instalação, remoção e "
 "construção de pacotes"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
-"--root (-r) somente pode ser especificado durante a instalação, remoção, "
-"consulta e reconstrução de bancos de dados"
+"--justdb somente pode ser especificado durante a instalação ou remoção de "
+"pacotes"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "os argumentos para --root (-r) devem começar com uma /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "nenhum pacote foi passado para remoção"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "nenhum pacote foi passado para instalação"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "nenhum argumento foi passado para consulta"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "nenhum argumento foi passado para verificação"
 
@@ -408,7 +401,7 @@ msgstr "remover specfile ao finalizar"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "pule direto para o estágio especificado (somente para c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "substituir plataforma de destino"
 
@@ -470,96 +463,131 @@ msgstr "Construindo plataformas de destino: %s\n"
 msgid "Building for target %s\n"
 msgstr "Construindo para o destino %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "Inicializar banco de dados"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "reconstruir as listas invertidas do banco de dados a partir dos cabeçalhos "
 "dos pacotes instalados"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "verificar arquivos do banco de dados"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Opções de banco de dados:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "verificar a(s) assinatura(s) do pacote"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "importar uma chave pública blindada"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Opções de assinatura:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "nenhum argumento foi passado"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "instalar pacote(s)"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "assinar pacote(s) (idêntico ao --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "remover a assinatura dos pacotes"
 
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Opções de assinatura:"
+
 # , c-format
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Não foi possível executar %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Você deve definir o \"%%_gpg_name\" no seu arquivo de macro\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Digite a senha: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Senha ok.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "A verificação da senha falhou\n"
 
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "consultar um arquivo spec"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "utilizar o seguinte formato de consulta"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Opções de assinatura:"
+
 # , c-format
-#: build/build.c:133 build/pack.c:405
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Não foi possível abrir o arquivo temporário.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Executando (%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "A execução de %s falhou (%s): %s\n"
 
 # , c-format
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Status de saída de %s inválido (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -774,34 +802,34 @@ msgid "File not found by glob: %s\n"
 msgstr "O arquivo não foi encontrado pelo glob: %s\n"
 
 # , c-format
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Não foi possível abrir %%files arquivo %s: %m\n"
 
 # , c-format
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
 
 # , c-format
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Arquivo inválido: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Proprietário/grupo inválido: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Procurando por arquivos desempacotados: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -810,12 +838,12 @@ msgstr ""
 "Arquivo(s) instalado(s) (mas não empacotado(s)) encontrado(s):\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Processando arquivos: %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binários dependentes de arquitetura no pacote noarch\n"
 
@@ -1061,33 +1089,33 @@ msgstr "Nome faltando no %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "nenhuma descrição no %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linha %d: Erro ao analisar %%description: %s\n"
 
 # , c-format
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linha %d: Opção inválida %s: %s\n"
 
 # , c-format
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "linha %d: Nomes em excesso: %s\n"
 
 # , c-format
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "linha %d: O pacote não existe: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "linha %d: Segunda descrição\n"
@@ -1182,106 +1210,106 @@ msgid "Unknown icon type: %s\n"
 msgstr "Tipo de ícone desconhecido: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "linha %d: A etiqueta toma apenas um token: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "linha %d: caractere inválido \"%c\" em: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "linha %d: caractere inválido em: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "linha %d: caractere inválido \"..\" em: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "linha %d: Etiqueta mal formada: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "linha %d: Etiqueta vazia: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "linha %d: Os prefixos não podem terminar com \"/\": %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "linha %d: O docdir deve começar com \"/\": %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "linha %d: campo Epoch deve ser um número sem sinal: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "linha %d: %s inválido: qualificadores: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "linha %d: formato BuildArchitecture inválido: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "linha %d: Somente subpacotes noarch são suportados: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Erro interno: tag %d falsa\n"
 
 # , c-format
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "linha %d: %s é obsoleto: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Especificação do pacote inválida: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "O pacote já existe: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "linha %d: Etiqueta desconhecida: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} não pode ser vazio\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} não pode ser \"/\"\n"
@@ -1345,7 +1373,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "número da correção %s inválido: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linha %d: segundo %%prep\n"
@@ -1425,32 +1453,32 @@ msgstr "Não foi possível abrir %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "%%if não fechado\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d:  parseExpressionBoolean retornou %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Há um %%else sem um %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Há um %%endif sem um %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "instrução %%include mal formada\n"
 
 # , c-format
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Nenhuma arquitetura compatível encontrada para a construção\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote não tem %%description: %s\n"
@@ -1501,27 +1529,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Erro ao analisar %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Executando (%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "%s faltando em %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Argumentos em excesso na linha de dados em %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Processando arquivos: %s\n"
@@ -1551,7 +1579,7 @@ msgid "Couldn't exec %s: %s\n"
 msgstr "Não foi possível executar %s: %s\n"
 
 # , c-format
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Não foi possível bifurcar %s: %s\n"
@@ -1603,7 +1631,7 @@ msgstr "Localizando %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Falha ao localizar %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "a consulta ao specfile %s falhou, não foi possível analisá-lo\n"
@@ -1880,92 +1908,100 @@ msgstr "%s é um Delta RPM e não pode ser instalado diretamente\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Carga útil (%s) não suportada no pacote %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "predefinir MACRO com valor EXPR"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "\"MACRO EXPR\""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "definir MACRO com valor EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "imprimir expansão do macro da EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "\"EXPR\""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "ler <ARQUIVO:...> ao invés do(s) arquivo(s) padrão"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<ARQUIVO:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "não verificar digest(s) dos pacotes"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "não verificar cabeçalho(s) do banco de dados ao recuperá-lo(s)"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "não verificar a(s) assinatura(s) do pacote"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "enviar stdout para CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "utilizar ROOT como o diretório de nível mais alto"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "exibir etiquetas de consulta conhecidas"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "exibir configuração final do rpmrc e do macro"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "fornece uma saída menos detalhada"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "fornece uma saída mais detalhada"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "mostra a versão do rpm que está sendo usada"
 
 # , c-format
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "depurar máquina de estados do arquivo de carga últil"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "depurar E/S rpmio"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabela de opções mal configurada (%d)\n"
@@ -1986,16 +2022,16 @@ msgstr "realocações devem conter um ="
 msgid "relocations must have a / following the ="
 msgstr "realocações devem conter uma / após o ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "adicionar pacotes sugeridos à transação"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instala todos os arquivos, até configurações que poderiam ser ignoradas"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -2003,159 +2039,155 @@ msgstr ""
 "remover todos os pacotes iguais ao <pacote> (normalmente um erro é gerado se "
 "o <pacote> especificou múltiplos pacotes)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "não executar scriptlet(s) do pacote"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "realocar arquivos em pacotes não realocáveis"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "exibir loops de dependências como aviso"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "remover (desinstalar) pacote"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<pacote>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "não instalar arquivos de configuração"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "não instalar documentação"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "ignorar arquivos com componentes principais <caminho> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<caminho>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "detectar conflitos de arquivo entre os pacotes"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "atalho para --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "atualizar pacote(s) se já estiver(em) instalado(s)"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<arquivo_do_pacote>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "exibir cerquilhas a medida que o pacote instala (bom com -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "não verificar a arquitetura do pacote"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "não verificar o sistema operacional do pacote"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "não verificar o espaço em disco antes de instalar"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "instalar a documentação"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "instalar pacote(s)"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "atualizar o banco de dados, mas não modificar o sistema de arquivos"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "não verificar as dependências do pacote"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr "não verificar o digest dos arquivos"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr "não verificar o digest dos arquivos (obsoleto)"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "não instalar contextos de segurança dos arquivos"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "não reordenar a instalação dos pacotes para satisfazer as dependências"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "não sugerir a resolução de dependências não encontradas"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "não executar o scriptlet %%pre (se existir)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "não executar o scriptlet %%post (se existir)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "não executar o scriptlet %%preun (se existir)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "não executar o scriptlet %%postun (se existir)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "não executar nenhum scriptlet disparado por este pacote"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "não executar nenhum scriptlet %%triggerprein"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "não executar nenhum scriptlet %%triggerin"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "não executar nenhum scriptlet %%triggerun"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "não executar nenhum scriptlet %%triggerpostun"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr "não realizar nenhuma ação de coleção"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2163,39 +2195,39 @@ msgstr ""
 "atualizar para uma versão mais antiga do pacote (--force em atualizações faz "
 "isso automaticamente)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "exibir porcentagens na medida em que o pacote vai sendo instalado"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "realocar o pacote para <dir>, se for realocável"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "realocar arquivos do caminho <antigo> para o <novo>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<antigo>=<novo>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "ignorar conflitos de arquivos entre pacotes"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "reinstalar se o pacote já estiver presente"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "não instalar, mas dizer se a instalação funcionaria ou não"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "atualizar pacote(s)"
 
@@ -2284,10 +2316,6 @@ msgstr "listar arquivos do pacote"
 msgid "skip %%ghost files"
 msgstr "ignorar arquivos %%ghost"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "utilizar o seguinte formato de consulta"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "exibir o estado dos arquivos listados"
@@ -2923,33 +2951,33 @@ msgstr "Por favor, contate %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Não foi possível abrir %s para leitura: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "suporte a scriptlet <lua> não embutido\n"
 
 # , c-format
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Não foi possível criar um arquivo temporário para %s: %s\n"
 
 # , c-format
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Não foi possível duplicar o descritor do arquivo: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "o scriptlet %s falhou, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "o scriptlet %s falhou, sinal %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "o scriptlet %s falhou, status de saída %d\n"
@@ -2958,11 +2986,11 @@ msgstr "o scriptlet %s falhou, status de saída %d\n"
 msgid "Unknown format"
 msgstr "Formato desconhecido"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 msgid "install"
 msgstr "instalar"
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr "apagar"
 
@@ -3065,11 +3093,11 @@ msgstr "Verificação de assinatura: PARÂMETROS INVÁLIDOS\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Assinatura: DESCONHECIDA (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr "ignorado"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "failed"
 msgstr "falhou"
 
@@ -3144,158 +3172,148 @@ msgstr "| esperado no fim da expressão"
 msgid "array iterator used with different sized arrays"
 msgstr "iterador da matriz utilizado com diferentes tamanhos de matrizes"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d não disponível\n"
-
 # , c-format
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "não foi possível abrir o índice %s usando o db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "nenhum dbpath foi definido\n"
 
 # , c-format
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "erro (%d) ao obter os registros \"%s\" a partir do índice %s\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: ignorando"
 
 # , c-format
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "erro (%d) ao armazenar o registro #%d em %s\n"
 
 # , c-format
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: o regexec falhou: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: o regcomp falhou: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: ignorando"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: cabeçalho danificado #%u recuperado -- ignorando.\n"
 
 # , c-format
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "erro (%d) ao obter os registros \"%s\" a partir do índice %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "erro(%d) ao adicionar o registro de cabeçalho #%d\n"
 
 # , c-format
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "erro(%d) ao remover o registro de cabeçalho #%d\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: não foi possível ler o cabeçalho em 0x%x\n"
 
 # , c-format
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "erro (%d) ao definir registros \"%s\" a partir do índice %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "erro (%d) ao armazenar o registro \"%s\" em %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "erro (%d) ao remover o registro \"%s\" a partir de %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erro (%d) ao alocar nova instância do pacote\n"
 
 # , c-format
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erro (%d) ao armazenar o registro %s em %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "nenhum dbpath foi definido"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "o banco de dados temporário %s já existe\n"
-
 # , c-format
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "falha ao criar o diretório %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "o cabeçalho #%u do banco de dados é inválido -- ignorando.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "não é possível adicionar o registro originalmente em %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "falha ao reconstruir o banco de dados: o banco de dados original permanece "
 "no lugar\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "falha ao substituir o banco de dados velho pela novo!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "substituir arquivos em %s com arquivos de %s para recuperação"
 
 # , c-format
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falha ao remover o diretório %s: %s\n"
@@ -3543,29 +3561,29 @@ msgstr "O arquivo %s tem menos de %u bytes\n"
 msgid "failed to create directory"
 msgstr "falha ao criar o diretório"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "sintaxe inválida no scriptlet lua: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "sintaxe inválida no script lua: %s\n"
 
 # , c-format
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "falha no script lua: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "sintaxe inválida no arquivo lua: %s\n"
 
 # , c-format
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "falha na conexão lua: %s\n"
@@ -3671,21 +3689,35 @@ msgstr "%s: falha na leitura do manifesto: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "não verificar a assinatura do cabeçalho+carga útil"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps somente pode ser especificado durante a construção, "
+#~ "reconstrução, recompilação, instalação, remoção ou verificação de pacotes"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) somente pode ser especificado durante a instalação, remoção, "
+#~ "consulta e reconstrução de bancos de dados"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "detectar conflitos de arquivo entre os pacotes"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d não disponível\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "o banco de dados temporário %s já existe\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "consultar/verificar pacote(s) com um identificador de arquivos"
 
-#~ msgid "query a spec file"
-#~ msgstr "consultar um arquivo spec"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
-#~ msgid "Signature options:"
-#~ msgstr "Opções de assinatura:"
-
-#~ msgid "Database options:"
-#~ msgstr "Opções de banco de dados:"
-
 #~ msgid "Internal error in argument processing (%d) :-(\n"
 #~ msgstr "Erro interno no processamento do argumento (%d) :-(\n"
 
diff --git a/po/rpm.pot b/po/rpm.pot
index 0616c4627..61847446d 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr ""
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
@@ -63,167 +63,159 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 msgid "Query/Verify package selection options:"
 msgstr ""
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+msgid "only installation and upgrading may be forced"
 msgstr ""
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-
-#: rpmqv.c:239
+#: rpmqv.c:230
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -359,7 +351,7 @@ msgstr ""
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr ""
 
@@ -416,90 +408,122 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr ""
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr ""
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr ""
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr ""
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+msgid "Keyring options:"
+msgstr ""
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr ""
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 msgid "sign package(s)"
 msgstr ""
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr ""
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr ""
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+msgid "query spec file(s)"
+msgstr ""
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr ""
+
+#: rpmspec.c:42
+msgid "Spec options:"
+msgstr ""
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr ""
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -699,44 +723,44 @@ msgstr ""
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -955,30 +979,30 @@ msgstr ""
 msgid "no description in %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr ""
@@ -1063,97 +1087,97 @@ msgstr ""
 msgid "Unknown icon type: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr ""
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr ""
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr ""
@@ -1212,7 +1236,7 @@ msgstr ""
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1283,31 +1307,31 @@ msgstr ""
 msgid "Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1353,27 +1377,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, c-format
 msgid "Error parsing %s: %s\n"
 msgstr ""
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr ""
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, c-format
 msgid "Missing module path in line: %s\n"
 msgstr ""
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr ""
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, c-format
 msgid "Processing policies: %s\n"
 msgstr ""
@@ -1398,7 +1422,7 @@ msgstr ""
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
@@ -1447,7 +1471,7 @@ msgstr ""
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
@@ -1715,91 +1739,99 @@ msgstr ""
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr ""
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr ""
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr ""
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr ""
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr ""
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr ""
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1820,211 +1852,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr ""
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr ""
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr ""
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr ""
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr ""
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 msgid "don't verify digest of files"
 msgstr ""
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 msgid "don't verify digest of files (obsolete)"
 msgstr ""
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr ""
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -2113,10 +2141,6 @@ msgstr ""
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr ""
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr ""
@@ -2722,31 +2746,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr ""
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr ""
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr ""
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr ""
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr ""
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr ""
@@ -2755,11 +2779,11 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2860,11 +2884,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "failed"
 msgstr ""
 
@@ -2938,142 +2962,132 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr ""
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr ""
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr ""
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr ""
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3305,27 +3319,27 @@ msgstr ""
 msgid "failed to create directory"
 msgstr ""
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c2e635c47..1b5e64c85 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2010-04-02 21:55+0800\n"
 "Last-Translator: Misha Shnurapet <zayzayats@yandex.ru>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ������ %s\n"
@@ -59,128 +59,129 @@ msgstr "������ ������ ��������� �� ������\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "���������� �������� ������� payload: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "���������/��������� ������ � ������"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "��������� ������� (� -q ��� --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "��������� �������� (� -V ��� --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "��������� ���������/����������/��������:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "����� ��������� ��� ���� ������� � ����������� rpm:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "�� ���� ��� ����� ���� �������� ������ ���� ��� �������� ��� �������"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "����������� ����� �������"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "����������� ������ �������"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "����������� �������� �������"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "����� ���� ������ ������ ���� �� �������� �������"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "��������������� ����� ���� ������ ���������, ����������, �������� ���������� "
 "� ����� ������������"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "����� ����� ���� ���������� ������ ��� ��������� ������"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "--prefix ������ ������������ � --relocate ��� --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "�������� --relocate � --excludepath ����� ������������ ������ ��� ��������� "
 "����� �������"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "������� --prefix ����� ������������ ������ ��� ��������� ����� �������"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "��������� ��� --prefix ������ ���������� � /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "����� ���� ����������� ������ ���� �� ���������� --excludedocs ��� --"
 "includedocs"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ����� ���� ������ ������ ��� �������� ������"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ����� ���� ������ ������ ��� ��������� ������"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ����� ���� ������ ������ ��� ��������� ��� �������� ������"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -188,7 +189,7 @@ msgstr ""
 "��������� ������� ��������� ����� ���� ������� ������ ��� ��������� ��� "
 "�������� ������"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -196,46 +197,36 @@ msgstr ""
 "��������� ������� ��������� ����� ���� ������ ������ ��� ��������� ��� "
 "�������� ������(��)"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps ����� ���� ������ ������ ��� ������, ���������, �������� � �������� "
-"�������"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test ����� ���� ������ ������ ��� ���������, �������� � ������ ������"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) ����� ���� ������� ������ ��� ���������, ��������, �������� "
-"������ � ������������ ���� ������"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb ����� ���� ������ ������ ��� ��������� ��� �������� ������"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "��������� ��� --root (-r) ������ ���������� � /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "�� ������ ������ ��� ��������"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "�� ������ ������ ��� ���������"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "�� ������ ��������� �������"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "�� ������ ��������� ��� �����������"
 
@@ -383,7 +374,7 @@ msgstr "����� ���������� ������� ���� ������������"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "������� ��������������� � ���������� ����� (������ ��� c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "�������������� ������� ���������"
 
@@ -441,94 +432,129 @@ msgstr "��������� ��� ������: %s\n"
 msgid "Building for target %s\n"
 msgstr "������ ��� ��������� %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "���������������� ���� ������"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "����������������� ���� ��������������� ������� �� ������������� ���������� "
 "�������"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "��������� ����� ���� ������"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "��������� ���� ������"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "��������� �������(�) ������"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "������������� �������� ����"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "��������� �������:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "�� ������ ���������"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "���������� �����(�)"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "��������� ����� (�� �� ����� ��� --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "��������� �������(�) ������"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "��������� �������:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "���������� ��������� %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "�� ������ ���������� \"%%_gpg_name\" � ����� ����������\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "������� �������� �����: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "�������� ����� �������.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "�������� �������� �����\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "��������� ���� ������������"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "����������� ��������� ������ �������"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "��������� �������:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "���������� ������� ��������� ����.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "�����������(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "��������� %s �� ������� (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "�������� ��� �������� �� %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -731,32 +757,32 @@ msgstr "Glob �� �����������: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "���� �� ������: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "���������� ������� ���� %%files %s: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "������: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�������� ���� %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�������� ���� ��������/������: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "�������� �� �������������(�) ����(�): %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -765,12 +791,12 @@ msgstr ""
 "���������(�) �������������(�) (�� �� �����������(�)) ����(�):\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "�������������� �����: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "�������� ������ � ������������ � ������ noarch\n"
 
@@ -989,30 +1015,30 @@ msgstr "��������� ��� � %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "��� �������� � %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "������ %d: ������ ������� %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "������ %d: �������� �������� %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "������ %d: ������� ����� ����: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "������ %d: ����� �� ����������: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "������ %d: ������ ��������\n"
@@ -1097,97 +1123,97 @@ msgstr "���������� ��������� ����������� %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "����������� ��� �����������: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "������ %d: ����� ������� ������ ���� ��������: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "������ %d: ������������ ������ '-' � %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "������ %d: ������������ ������ '-' � %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "������ %d: ������������ ������ '-' � %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "������ %d: �������� ���: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "������ %d: ������ ���: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "������ %d: ������� �� ����� ������������� �� \"/\": %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "������ %d: Docdir ������ ���������� � '/': %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "������ %d: ���� Epoch/Serial ������ ���� ������: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "������ %d: �������� ����� %s: ����������: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "������ %d: �������� ������ BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "���������� ������: ����������� ����� %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "������ %d: ��������� ������: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "�������� ������������ ������: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "����� ��� ����������: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "������ %d: ����������� ���: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot �� ����� ���� \"/\": %s\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot �� ����� ���� \"/\": %s\n"
@@ -1247,7 +1273,7 @@ msgstr "%s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "�������� ����� ������: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "������ %d: ������ %%prep\n"
@@ -1320,31 +1346,31 @@ msgstr "���������� ������� %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "���������� %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean ��� ��������: %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: ������ %%else ��� %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: ������ %%endif ��� %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "�������� ���������� %%include\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "�� ������� ����������� ����������� ��� ������.\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "����� �� ����� %%description: %s\n"
@@ -1391,27 +1417,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "������ ������� %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "�����������(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "����������� %s � %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "������� ����� ���������� � ������ ������ � %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "�������������� �����: %s-%s-%s\n"
@@ -1436,7 +1462,7 @@ msgstr "���������� ��������� %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "���������� ��������� %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "���� ��������� %s: %s\n"
@@ -1486,7 +1512,7 @@ msgstr "���� �����  %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "���������� ����� %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "������ ����� ������������ %s �� ������, ���������� ��������� ����\n"
@@ -1763,91 +1789,99 @@ msgstr "%s �� ����� ���� ����������\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "������������� MACRO �� ��������� EXPR"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MACRO EXPR'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "���������� MACRO �� ��������� EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "������� �������� ������� EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'EXPR'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "������������ <FILE:...> ������ �����(��) �� ���������"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "�� ��������� �������� ������(��)"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "�� ��������� ���������, ����������� �� ���� ������"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "�� ��������� �������(�) � ������(��)"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "������� ����������� ����� � CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "������������ ROOT ��� �������� �������"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "���������� ��������� ����� �������"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "�������� ������� �������� rpmrc � ��������"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "�������� ������� ���������"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "�������� ����� ��������� ���������"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "������� ����� ������ ���� ��������"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "������� ������ ��������� �������������� ������ "
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "������� �������� �����/������ rpmio"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: ������� ���������� ����������� ��������� (%d)\n"
@@ -1868,17 +1902,17 @@ msgstr "����������� ������ ��������� ="
 msgid "relocations must have a / following the ="
 msgstr "����������� ������ ����� / ����� ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "�������� ������������ ������ � ����������"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "������������� ��� �����, ���� ����������������, ������� ����� �� ���� "
 "���������"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1886,165 +1920,160 @@ msgstr ""
 "������� ��� ������, ����������� � <�����> (������, ���� <�����> "
 "������������� ���������� �������, ������������ ������)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "�� ��������� ������� ��������� ������(��)"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "����������� ����� � �������������� ������"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "������� (����������������) �����"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<�����>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "�������� ��� ����� ������������"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "�� ������������� ������������"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "���������� ����� � ���� <����>"
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<����>"
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "����������� ����� � �������������� ������"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "���������� ��� --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "�������� �����(�) ���� ��� ����������"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<���� ������>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "�������� \"#\" �� ���� ��������� ������ (������ � -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "�� ��������� ����������� ������"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "�� ��������� ������������ ������� ������"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "�� ��������� �������� ������������ ����� ����������"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "���������� ������������"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "���������� �����(�)"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "�������� ���� ������, �� �� �������������� �������� �������"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "�� ��������� ����������� ������"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "�� ��������� ����� �� ����������� ����� MD5"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "�� ��������� ����� �� ����������� ����� MD5"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "�������� ��� ����� ������������"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "�� ������ ������� ��������� ������� ��� �������������� ������������"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "�� ���������� ���������� �����������(��) �����������(��)"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "�� ���������  %%pre ��������� (���� ����)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "�� ��������� %%post ��������� (���� ����)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "�� ��������� %%preun ��������� (���� ����)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "�� ��������� %%postun ��������� (���� ����)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "�� ��������� �������-���������, ���������� ���� �������"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "�� ��������� %%triggerprein ���������"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "�� ��������� %%triggerin ���������"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "�� ��������� %%triggerun ���������"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "�� ��������� %%triggerpostun ���������"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2052,39 +2081,39 @@ msgstr ""
 "����� �� ����� ������ ������ ������ (--force ��� ���������� ������ ��� "
 "�������������)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "�������� ������� ���������� �� ���� ��������� ������"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "����������� ����� � <�������>, ���� ����� ��� ���������"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<�������>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "����������� ����� �� ���� <old> � <new>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<old>=<new>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "��������������, ���� ����� ��� ����������"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "�� �������������, � ������ ��������, ������� �� ���������"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "�������� �����(�)"
 
@@ -2174,10 +2203,6 @@ msgstr "�������� ������ ������ ������"
 msgid "skip %%ghost files"
 msgstr "���������� ����� %%ghost"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "����������� ��������� ������ �������"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "�������� ��������� ������������� ������"
@@ -2795,31 +2820,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "���������� ������� %s ��� ������: %s.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "���� ��������� %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "���� ��������� %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s) ������ ��������, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s) ������ ���������� ��������, ��� �������� %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s) ������ ���������� ��������, ��� �������� %d\n"
@@ -2829,12 +2854,12 @@ msgstr "%s(%s-%s-%s) ������ ���������� ��������, ��� �������� %d\n"
 msgid "Unknown format"
 msgstr "����������� ���"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(����������)"
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2937,11 +2962,11 @@ msgstr "�������� �������: ������������ ���������\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "�������: ���������� (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s �� �������\n"
@@ -3016,145 +3041,135 @@ msgstr "� ����� ��������� �������� \"|\""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "���������� ������� ������ %s ��������� db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "��������� dbpath �� ����������\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "������(%d) ��������� ������� \"%s\" �� ������� %s\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 #, fuzzy
 msgid "miFreeHeader: skipping"
 msgstr "rpmdb: ������������"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "������ (%d) ���������� ������ #%d � %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: ������ Fseek: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: ������ ��������: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 #, fuzzy
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdb: ������������"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: ������� ������������ ��������� #%u -- ������������.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "������(%d) ��������� ������� \"%s\" �� ������� %s\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "������(%d) ���������� ������ ���������  #%d ��� �������� %s\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "������(%d) ���������� ������ ���������  #%d ��� �������� %s\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ���������� �������� ��������� � 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "������(%d) ��������� \"%s\" ������� �� ������� %s\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "������(%d) ���������� ������ \"%s\" � %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "������(%d) �������� ������ %s �� %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "������(%d) �������������� ������ ��� ������ ������ ������\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "������(%d) ������ ������ %s � %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "��������� dbpath �� ����������"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "��������� ���� ������ %s ��� ����������\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "������ �������� �������� %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "��������� ����� %u � ���� ������ �������� -- ������������.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "���������� �������� ������ (������������� � %u)\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "������������ ���� ������ �� �������, ������ ���� ������ �������� �� �����\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "���������� �������� ������ ���� ������ �� �����!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "����� � %s ���������� ������� �� %s ��� ��������������"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "������ �������� �������� %s: %s\n"
@@ -3390,27 +3405,27 @@ msgstr "����� ����� %s ������ ��� %u ����\n"
 msgid "failed to create directory"
 msgstr "������ �������� �������� %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- �� �������������� ��� �����\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: ������ Fwrite: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "�������� ����� ������: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: ������ Fseek: %s\n"
@@ -3513,12 +3528,30 @@ msgstr "%s: ������ ������ ������ ������: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "�� ��������� ������� ���������� � �����������"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps ����� ���� ������ ������ ��� ������, ���������, �������� � "
+#~ "�������� �������"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) ����� ���� ������� ������ ��� ���������, ��������, �������� "
+#~ "������ � ������������ ���� ������"
+
+#, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "����������� ����� � �������������� ������"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "��������� ���� ������ %s ��� ����������\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "���������/��������� �����(�) �� �������������� �����"
 
-#~ msgid "query a spec file"
-#~ msgstr "��������� ���� ������������"
-
 #~ msgid "<spec>"
 #~ msgstr "<���� ������������>"
 
@@ -3531,12 +3564,6 @@ msgstr "�� ��������� ������� ���������� � �����������"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "������������ �������� ������\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "��������� �������:"
-
-#~ msgid "Database options:"
-#~ msgstr "��������� ���� ������"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "��� ������ ��� �������\n"
 
diff --git a/po/sk.po b/po/sk.po
index 72985e43f..84217d90c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -16,7 +16,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "s�bor %s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzia %s\n"
@@ -57,183 +57,172 @@ msgstr "chyba pri ��tan� hlavi�ky bal�ka\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "nie je mo�n� otvori� s�bor %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "op�ta� sa v�etk�ch bal�kov v skupine"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 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:129
+#: rpmqv.c:125
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "neo�ak�van� zdroj pre ot�zku"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "m��e by� pou�it� iba jeden hlavn� re�im"
 
-#: rpmqv.c:157
+#: rpmqv.c:153
 #, fuzzy
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+msgid "only installation and upgrading may be forced"
 msgstr "iba in�tal�cia, aktualiz�cia a odstr�nenie zdrojov m��u by� vyn�ten�"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 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:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 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:168
+#: rpmqv.c:164
 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:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pre --prefix musia za��na� znakom /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 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:178
+#: rpmqv.c:174
 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:182
+#: rpmqv.c:178
 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:186
+#: rpmqv.c:182
 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:190
+#: rpmqv.c:186
 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:194
+#: rpmqv.c:190
 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:198
+#: rpmqv.c:194
 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:202
+#: rpmqv.c:198
 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:207
+#: rpmqv.c:203
 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:211
+#: rpmqv.c:207
 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:215
+#: rpmqv.c:211
 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:220
+#: rpmqv.c:216
 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:225
+#: rpmqv.c:221
 #, 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:230
+#: rpmqv.c:226
 #, 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:234
+#: rpmqv.c:230
 #, fuzzy
 msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps m��e by� pou�it� iba po�as in�tal�cie, odstr�nenia alebo overenia "
-"bal�ka"
-
-#: rpmqv.c:239
-msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test m��e by� pou�it� iba po�as in�tal�cie, odstr�nenia alebo zostavenia "
 "bal�ka"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-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:234
+#, fuzzy
+msgid "--test 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:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pre --root (-r) musia za��na� znakom /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "neboli zadan� �iadne bal�ky pre in�tal�ciu"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "neboli zadan� �iadne bal�ky pre in�tal�ciu"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "neboli zadan� �iadne argumenty pre ot�zku"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "neboli zadan� �iadne argumenty pre overenie"
 
@@ -384,7 +373,7 @@ msgstr "po ukon�en� odstr�ni� zdrojov� s�bory a spec-s�bor"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "presko�i� priamo k ur�enej etape (iba pre c, i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "predefinova� cie�ov� platformu"
 
@@ -442,98 +431,135 @@ msgstr "predefinova� cie�ov� platformu"
 msgid "Building for target %s\n"
 msgstr "vyh�ad�va sa bal�k %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr ""
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 #, fuzzy
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "znovu vytvori� datab�zu z existuj�cej"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 #, fuzzy
 msgid "verify database files"
 msgstr "op�ta� sa spec s�boru"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+#, fuzzy
+msgid "Database options:"
+msgstr "Ve�kos� podpisu:   %d\n"
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "overi� podpis bal�ka"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Ve�kos� podpisu:   %d\n"
+
+#: rpmkeys.c:61 rpmsign.c:143
 #, fuzzy
 msgid "no arguments given"
 msgstr "neboli zadan� �iadne argumenty pre ot�zku"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "in�talova� bal�k"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podp�sa� bal�k (zni�i� aktu�lny podpis)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "overi� podpis bal�ka"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+#, fuzzy
+msgid "Signature options:"
+msgstr "Ve�kos� podpisu:   %d\n"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie je mo�n� spusti� %s"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Mus�te nastavi� \"%%gpg_name\" vo va�om makro-s�bore"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Heslo je v poriadku.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Kontrola hesla zlyhala\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "op�ta� sa spec s�boru"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "pou�i� nasledovn� form�t ot�zky"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Ve�kos� podpisu:   %d\n"
+
+#: build/build.c:121 build/pack.c:405
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie je mo�n� otvori� do�asn� s�bor"
 
-#: build/build.c:181
+#: build/build.c:169
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Vykon�va sa: %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Vykonanie %s zlyhalo (%s)"
 
-#: build/build.c:196
+#: build/build.c:184
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Chybn� v�stupn� k�d z %s (%s)"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -745,44 +771,44 @@ msgstr "riadok %d: V %s s� vy�adovan� verzie: %s"
 msgid "File not found by glob: %s\n"
 msgstr "S�bor nebol n�jden�: %s"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "chybe: nie je mo�n� otvori� %%files s�bor: %s"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "riadok: %s"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "s�bor %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Chybn� vlastn�k/skupina: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "vyh�ad�va sa bal�k %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Spracov�vaj� sa s�bory: %s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1005,30 +1031,30 @@ msgstr "ch�baj�ce meno v %%changelog"
 msgid "no description in %%changelog\n"
 msgstr "�iadny popis v %%changelog"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, fuzzy, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "riadok %d: Chyba pri anal�ze %%description: %s"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "riadok %d: Chybn� vo�ba %s: %s"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "riadok %d: Prive�a n�zvov: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "riadok %d: Bal�k neexistuje: %s"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, fuzzy, c-format
 msgid "line %d: Second description\n"
 msgstr "riadok %d: Druh� popis"
@@ -1113,97 +1139,97 @@ msgstr "Nie je mo�n� pre��ta� ikonu: %s"
 msgid "Unknown icon type: %s\n"
 msgstr "Nezn�my typ ikony: %s"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "riadok %d: Chybn� vo�ba %s: %s"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "riadok %d: Nepr�pustn� znak '-' v %s: %s"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "riadok %d: Nepr�pustn� znak '-' v %s: %s"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "riadok %d: Nepr�pustn� znak '-' v %s: %s"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "riadok %d: Znetvoren� popis: %s"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "riadok %d: Pr�zdny popis: %s"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, fuzzy, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "riadok %d: Prefixy nesm� kon�i� \"/\": %s"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "riadok %d: Docdir mus� za��na� '/': %s"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "riadok %d: Epoch/Serial pole mus� by� ��slo: %s"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "riadok %d: Chybn� %s ��slo: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "riadok %d: Chybn� form�t BuildArchitecture: %s"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Intern� chyba: �udn� popis %d "
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "riadok %d: V %s s� vy�adovan� verzie: %s"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Chybn� �pecifik�cia bal�ka: %s"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "Bal�k u� existuje: %s"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "riadok %d: Nezn�my popis: %s"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "riadok %d: BuildRoot nem��e by� \"/\": %s"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "riadok %d: BuildRoot nem��e by� \"/\": %s"
@@ -1263,7 +1289,7 @@ msgstr "s�bor %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "chybn� ��slo bal�ku: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, fuzzy, c-format
 msgid "line %d: second %%prep\n"
 msgstr "riadok %d: druh� %%prep"
@@ -1334,32 +1360,32 @@ msgstr "otvorenie zlyhalo: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Neuzavret� %%if"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr ""
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: %%else bez if"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, fuzzy, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: %%endif bez if"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, fuzzy, c-format
 msgid "malformed %%include statement\n"
 msgstr "znetvoren� pr�kaz %%include"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "�iadne zostavite�n� architekt�ry"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Bal�k neobsahuje %%description: %s"
@@ -1406,27 +1432,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Chyba pri anal�ze %%setup: %s"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Vykon�va sa: %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "ch�baj�ce    %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Prive�a argumentov v riadku �dajov na %s:%d"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Spracov�vaj� sa s�bory: %s\n"
@@ -1451,7 +1477,7 @@ msgstr "Nie je mo�n� spusti� %s"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie je mo�n� spusti� %s"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie je mo�n� vytvori� proces %s"
@@ -1501,7 +1527,7 @@ msgstr "Zis�uj� sa po�adovan� vlastnosti...\n"
 msgid "Failed to find %s:\n"
 msgstr "Nepodarilo sa zisti� poskytovan� vlastnosti"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "ot�zka na spec-s�bor %s zlyhala, nie je mo�n� analyzova�\n"
@@ -1781,98 +1807,106 @@ msgstr "%s nie je mo�n� nain�talova�\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "vyp�sa� verziu pou��van�ho rpm"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "neoverova� z�vislosti bal�ka"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "neoverova� architekt�ru bal�ka"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "overi� podpis bal�ka"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "posla� �tandardn� v�stup do <pr�kazu>"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "pou�i� <adres�r> ako adres�r najvy��ej �rovne"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "vyp�sa� verziu pou��van�ho rpm"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "chybn� stav s�boru: %s"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1893,18 +1927,18 @@ msgstr "presunutia musia obsahova� znak ="
 msgid "relocations must have a / following the ="
 msgstr "presunutia musia ma� za znakom = znak /"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "op�ta� sa v�etk�ch bal�kov v skupine"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1912,172 +1946,167 @@ 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:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "nevykona� �iadne skripty �pecifikovan� bal�kom"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "odin�talova� bal�k"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 #, fuzzy
 msgid "<package>+"
 msgstr "n�jden�ch %d bal�kov\n"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "zobrazi� v�etky konfigura�n� s�bory"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "nein�talova� dokument�ciu"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "vynecha� s�bory v ceste <cesta>"
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr ""
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "bal�k %s nie je nain�talovan�\n"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skratka pre --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "        -p <s�bor_bal�ku>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 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:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "neoverova� architekt�ru bal�ka"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "neoverova� opera�n� syst�m bal�ka"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "pred in�tal�ciou nekontrolova� dostupn� miesto na disku"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "in�talova� dokument�ciu"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "in�talova� bal�k"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "aktualizova� datab�zu bez zmeny s�borov�ho syst�mu"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "neoverova� z�vislosti bal�ka"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "zobrazi� s�bory v bal�ku"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "zobrazi� s�bory v bal�ku"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "zobrazi� v�etky konfigura�n� s�bory"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nemeni� poradie bal�kov kv�li vyrie�eniu z�vislost�"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nevykona� �iadne etapy"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nevykona� �iadne etapy"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nevykona� �iadne etapy"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nevykona� �iadne etapy"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 #, 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:225
+#: lib/poptI.c:223
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nevykona� �iadne skripty �pecifikovan� bal�kom"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nevykona� �iadne in�tala�n� skripty"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nevykona� �iadne in�tala�n� skripty"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nevykona� �iadne in�tala�n� skripty"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2085,41 +2114,41 @@ msgstr ""
 "aktualizova� na star�iu verziu bal�ka (--force to pri aktualiz�cii urob� "
 "automaticky)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "vypisova� percent� po�as in�tal�cie bal�ka"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "presun�� bal�k do <adres�ra>, pokia� to bal�k povo�uje"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "presun�� s�bory zo <starej_cesty> do <novej_cesty>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "      --relocate <star�_cesta>=<nov�_cesta>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "prein�talova�, pokia� u� bal�k existuje"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "    --upgrade <s�bor_bal�ka>"
@@ -2225,10 +2254,6 @@ msgstr "zobrazi� s�bory v bal�ku"
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "pou�i� nasledovn� form�t ot�zky"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "zobrazii� stav dan�ch s�borov"
@@ -2858,31 +2883,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Nie je mo�n� otvori� %s pre ��tanie: %s."
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Nie je mo�n� vytvori� proces %s"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Nie je mo�n� vytvori� proces %s"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s vynechan� - prenos zlyhal - %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
@@ -2892,12 +2917,12 @@ msgstr "vykonanie skriptu zlyhalo"
 msgid "Unknown format"
 msgstr "nezn�my tag"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "nein�talovan� "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2999,11 +3024,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s zlyhalo"
@@ -3078,144 +3103,134 @@ msgstr "| o�ak�ven� na konci v�razu"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nie je mo�n� otvori� %s na %s:%d"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "nebola nastaven� �iadna dbpath"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "chyba pri na��tan� z�znamu %s z %s"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "chyba pri z�pise z�znamu %s do %s"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: otvorenie zlyhalo\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "chyba pri na��tan� z�znamu %s z %s"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "chyba pri na��tan� z�znamu %s z %s"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "chyba pri na��tan� z�znamu %s z %s"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, 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"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "chyba pri na��tan� z�znamu %s z %s"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "chyba pri z�pise z�znamu %s do %s"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "chyba pri odstra�ovan� z�znamu %s z %s"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba pri h�adan� bal�ka %s\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "chyba pri z�pise z�znamu %s do %s"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "nebola nastaven� �iadna dbpath"
 
-#: lib/rpmdb.c:2934
-#, fuzzy, c-format
-msgid "temporary database %s already exists\n"
-msgstr "do�asn� datab�za %s u� existuje"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "nepodarilo sa odstr�ni� adres�r %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, 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�"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie je mo�n� prida� z�znam p�vodne na %d"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori� datab�zu; zost�va p�vodn�\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi� star� datab�zu novou!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, 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"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstr�ni� adres�r %s: %s\n"
@@ -3450,27 +3465,27 @@ msgstr "S�bor %s je men�� ako %d bajtov"
 msgid "failed to create directory"
 msgstr "nepodarilo sa odstr�ni� adres�r %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- nie je podporovan� pre re�azce"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "chybn� ��slo bal�ku: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -3578,12 +3593,32 @@ msgid "don't verify header+payload signature"
 msgstr "overi� podpis bal�ka"
 
 #, fuzzy
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps m��e by� pou�it� iba po�as in�tal�cie, odstr�nenia alebo "
+#~ "overenia bal�ka"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ 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"
+
+#, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "bal�k %s nie je nain�talovan�\n"
+
+#, fuzzy
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "do�asn� datab�za %s u� existuje"
+
+#, fuzzy
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "op�ta� sa bal�ku vlastniaceho s�bor"
 
-#~ msgid "query a spec file"
-#~ msgstr "op�ta� sa spec s�boru"
-
 #~ msgid "Invalid %%_signature spec in macro file.\n"
 #~ msgstr "Chybn� �pecifik�cia %%_signature v makro-s�bore.\n"
 
@@ -3591,10 +3626,6 @@ msgstr "overi� podpis bal�ka"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Preplnenie cie�ovej vyrovn�vacej pam�ti"
 
-#, fuzzy
-#~ msgid "Signature options:"
-#~ msgstr "Ve�kos� podpisu:   %d\n"
-
 #~ msgid "cannot access file %s\n"
 #~ msgstr "nie je mo�n� pracova� so s�borom %s\n"
 
diff --git a/po/sl.po b/po/sl.po
index f7588fc3a..47d56b484 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM razli�ica %s\n"
@@ -62,177 +62,168 @@ msgstr "napaka pri branju glave paketa\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "ni mo�no vnovi� odpreti (payload): %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "poizvedba po paketu v skupini"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo en tip poizvedbe/preverjanja je mo�en naenkrat"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "nepri�akovane zastavice pri poizvedbi"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "nepri�akovana oblika poizvedbe"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "nepri�akovan izvor poizvedbe"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "izbran sme biti le en glavni na�in"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 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:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix se sme uporabiti le pri namestitvi"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti izbire --prefix se morajo za�eti z /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "izbiri --excludedocs in --includedocs se medsebojno izklju�ujeta"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sme podan le ob namestitvi paketa"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sme biti podati le ob namestitvi paketa"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 #, 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:230
+#: rpmqv.c:226
 #, 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:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps sme biti podan le ob izgradnji, vnovi�ni izgradnji, prevajanju, "
-"namestitvi, odstranitvi ali preverjanju paketa"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
-"vnovi�ni izgradnji paketa"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti izbire --root (-r) se morajo za�eti z /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
@@ -384,7 +375,7 @@ msgstr "po zaklju�ku odstrani datoteko s specifikacijami"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "preskok naravnost na dolo�eno stopnjo (samo za c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "brez upo�tevanja strojnega okolja ciljnega sistema"
 
@@ -442,98 +433,135 @@ msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr ""
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 #, fuzzy
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "ponovno izgradi zbirko iz obstoje�ih glav"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 #, fuzzy
 msgid "verify database files"
 msgstr "poizvedba po datoteki spec"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+#, fuzzy
+msgid "Database options:"
+msgstr "Dol�. podpisa : %d\n"
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "preveri podpis paketa(-ov)"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Dol�. podpisa : %d\n"
+
+#: rpmkeys.c:61 rpmsign.c:143
 #, fuzzy
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "name��anje paketa"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podpi�i paket(e) (trenutni podpis zavrzi)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "preveri podpis paketa(-ov)"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+#, fuzzy
+msgid "Signature options:"
+msgstr "Dol�. podpisa : %d\n"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ni mo�no izvesti %s: %s"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Vnesite pristopno geslo: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Pristopno geslo je pravo.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Preverjanje pristopnega gesla neuspe�no\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "poizvedba po datoteki spec"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "uporabi naslednjo obliko poizvedbe"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Dol�. podpisa : %d\n"
+
+#: build/build.c:121 build/pack.c:405
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Za�asne datoteke ni mo�no odpreti"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Izvajanje(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Izvajanje %s je bilo neuspe�no (%s): %s"
 
-#: build/build.c:196
+#: build/build.c:184
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s javi neuspe�no izhodno kodo (%s)"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -745,44 +773,44 @@ msgstr "vrstica %d: Razli�ica ni dovoljena: %s"
 msgid "File not found by glob: %s\n"
 msgstr "Datoteke ni mo�no najti z raz�iritvijo metaznakov v imenu: %s"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Datoteke %s iz %%files ni mo�no odpreti: %s"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "vrstica: %s"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Po�kodovana datoteka: %s: %s"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Neobstoje� lastnik/skupina: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "i��emo paket %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Obdeloavnje datotek: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1005,30 +1033,30 @@ msgstr "v %%changelog je manjkajo�e ime"
 msgid "no description in %%changelog\n"
 msgstr "opis v %%changelog manjka"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, fuzzy, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "vrstica %d: Napaka pri raz�lembi v razdelku %%description: %s"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "vrstica %d: Napa�na izbira %s: %s"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, fuzzy, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "vrstica %d: Preve� imen: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "vrstica %d: Paket ne obstaja: %s"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, fuzzy, c-format
 msgid "line %d: Second description\n"
 msgstr "vrstica %d: Drugi opis"
@@ -1113,97 +1141,97 @@ msgstr "Ikone %s ni mo�no prebrati: %s"
 msgid "Unknown icon type: %s\n"
 msgstr "Neznan tip ikone: %s"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, fuzzy, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "vrstica %d: Napa�na izbira %s: %s"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, fuzzy, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "vrstica %d: Deformirana zna�ka: %s"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, fuzzy, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "vrstica %d: Prazna zna�ka: %s"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, 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:747
+#: build/parsePreamble.c:722
 #, 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:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "vrstica %d: polje Epoch/Serial mora biti �tevilo: %s"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, fuzzy, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "vrstica %d: Okvarjeno �tevilo %s: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "vrstica %d: Napa�na oblika BuildArchitecture: %s"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, fuzzy, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Notranja napaka: Neprava zna�ka %d"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "vrstica %d: Zahtevana razli�ica: %s"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, fuzzy, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Nepravilno dolo�ilo paketa: %s"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, fuzzy, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket �e obstaja: %s"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, fuzzy, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "vrstica %d: Neznana zna�ka: %s"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot ne more biti \"/\": %s"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot ne more biti \"/\": %s"
@@ -1263,7 +1291,7 @@ msgstr "datoteka %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "neveljavna �tevilka paketa: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, fuzzy, c-format
 msgid "line %d: second %%prep\n"
 msgstr "vrstica %d: drugi %%prep"
@@ -1336,32 +1364,32 @@ msgstr "Ni mo�no odpreti %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Nezaklju�eni %%if"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, fuzzy, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean vrne %d"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, 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:368
+#: build/parseSpec.c:359
 #, 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:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, fuzzy, c-format
 msgid "malformed %%include statement\n"
 msgstr "Deformiran stavek %%include"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 #, fuzzy
 msgid "No compatible architectures found for build\n"
 msgstr "Arhitektura za izgradnjo ni prisotna"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, fuzzy, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "V paketu manjka %%description: %s"
@@ -1408,27 +1436,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Napaka pri raz�lembi %%setup: %s"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Izvajanje(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Manjkajo�i ,(` v %s %s"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Preve� argumentov v podatkovni vrstici v %s:%d"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Obdeloavnje datotek: %s-%s-%s\n"
@@ -1453,7 +1481,7 @@ msgstr "Ni mo�no izvesti %s: %s"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ni mo�no izvesti %s: %s"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Vejitev %s ni mo�na: %s"
@@ -1503,7 +1531,7 @@ msgstr "Iskanje  %s: (z uporabo %s)...\n"
 msgid "Failed to find %s:\n"
 msgstr "Neuspe�no iskanje %s:"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "poizvedba po datoteki spec. %s je bila neuspe�na, raz�lemba ni mo�na\n"
@@ -1783,98 +1811,106 @@ msgstr "%s ni mo�no namestiti\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "uporabljana razli�ica rpm"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "preveri podpis paketa(-ov)"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "standardni izhod preusmerjen na <ukaz>"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "uporabi <imenik> za korenski imenik"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "prika�i znane zna�ke za poizvedovanje"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "prika�i kon�ni rpmrc in nastavitev makra"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr ""
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr ""
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "razli�ica rpm, ki jo uporabljate"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr ""
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1895,17 +1931,17 @@ msgstr "premikanja morajo vsebovati ="
 msgid "relocations must have a / following the ="
 msgstr "premikanja morajo imeti /, ki mu sledi ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "poizvedba po paketu v skupini"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1913,173 +1949,168 @@ msgstr ""
 "odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer program izide z "
 "napako, �e paket <paket> dolo�a ve� paketov)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "brez izvajanja skriptov paketa"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "poti %s ni mo�no premakniti za paket %s-%s-%s"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "izbri�i (odstrani) paket"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 #, fuzzy
 msgid "<package>+"
 msgstr "ni paketov\n"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "izpis vseh nastavitvene datoteke"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "brez namestitve dokumentacije"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "preskok datotek v navedeni poti"
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr ""
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "poti %s ni mo�no premakniti za paket %s-%s-%s"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "okraj�ava za --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "paket %s-%s-%s je �e name��en"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "        -p <paket>+       "
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "brez preverjanja operacijskega sistema paketa"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "brez preverjanja prostora na disku pred name��anjem"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "namesti dokumentacijo"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "name��anje paketa"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "obnovi podatkovno zbirko, a ne spreminjaj datote�nega sistema"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "izpis vseh nastavitvene datoteke"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 #, 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:225
+#: lib/poptI.c:223
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "brez izvajanja skriptov paketa"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2087,41 +2118,41 @@ msgstr ""
 "nadgraditev na starej�o razli�ico paketa (--force pri nadgradnjah "
 "avtomati�no vklju�i to izbiro)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "izpis odstotkov med namestitvijo"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "�e je mogo�e, bo paket prestavljen v imenik <imenik>"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr ""
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "prestavljanje datoteke iz stare poti v novo"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "      --relocate <starapot>=<novapot>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "ponovno namesti, �e paket �e obstaja"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "ne namesti, a ugotovi, �e bi delovalo"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "    --upgrade <paket>      "
@@ -2226,10 +2257,6 @@ msgstr "izpis seznama datotek v paketu"
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "uporabi naslednjo obliko poizvedbe"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "izpis stanja seznama datotek"
@@ -2860,31 +2887,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "%s ni mo�no odpreti za branje: %s."
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Vejitev %s ni mo�na: %s"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Vejitev %s ni mo�na: %s"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "presko�eno - %s - prenos neuspe�en - %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "skript se ni uspe�no izvedel"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "skript se ni uspe�no izvedel"
@@ -2894,12 +2921,12 @@ msgstr "skript se ni uspe�no izvedel"
 msgid "Unknown format"
 msgstr "neznana zna�ka"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "ni name��eno  "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -3001,11 +3028,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dol�. polnila : %d\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s neuspe�en"
@@ -3080,146 +3107,136 @@ msgstr "na koncu izraza je pri�akovan |"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, 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)"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ni nastavljena"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, fuzzy, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: odpiranje je bilo neuspe�no: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ni mo�no prebrati glave pri 0x%x"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, fuzzy, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, fuzzy, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "napaka(%d) pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: lib/rpmdb.c:2934
-#, fuzzy, c-format
-msgid "temporary database %s already exists\n"
-msgstr "za�asna podatkovna zbirka %s �e obstaja"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "neuspe�na odstranitev imenika %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "zapis �t. %d v zbirki je po�kodovan -- presko�eno."
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "zapisa ni mo�no dodati na %d"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 #, 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"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe�na!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, 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"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe�na odstranitev imenika %s: %s\n"
@@ -3456,27 +3473,27 @@ msgstr "Datoteka %s je kraj�a od %d bajtov"
 msgid "failed to create directory"
 msgstr "neuspe�na odstranitev imenika %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- ni podprt za nize"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: pisanje Fwrite je bilo neuspe�no: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "neveljavna �tevilka paketa: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
@@ -3583,13 +3600,32 @@ msgstr "%s: branje Fread je bilo neuspe�no: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "preveri podpis paketa(-ov)"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps sme biti podan le ob izgradnji, vnovi�ni izgradnji, prevajanju, "
+#~ "namestitvi, odstranitvi ali preverjanju paketa"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
+#~ "vnovi�ni izgradnji paketa"
+
+#, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "poti %s ni mo�no premakniti za paket %s-%s-%s"
+
+#, fuzzy
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "za�asna podatkovna zbirka %s �e obstaja"
+
 #, fuzzy
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "poizvedba po paketu, ki vsebuje datoteko"
 
-#~ msgid "query a spec file"
-#~ msgstr "poizvedba po datoteki spec"
-
 #~ msgid "Invalid %%_signature spec in macro file.\n"
 #~ msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
@@ -3597,10 +3633,6 @@ msgstr "preveri podpis paketa(-ov)"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Ciljni medpomnilnik je bil prekora�en"
 
-#, fuzzy
-#~ msgid "Signature options:"
-#~ msgstr "Dol�. podpisa : %d\n"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "ni datotek, ki bi jih lahko podpisal\n"
 
diff --git a/po/sr.po b/po/sr.po
index c461e9891..08230f47c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2009-04-06 22:38+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM верзија %s\n"
@@ -65,124 +65,125 @@ msgstr "грешка при читању заглавља из пакета\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "не могу да поново отворим товар: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "испитај/провери пакет(е) у групи"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Опције упита (са -q или --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Опције провере (са -V или --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Опције инсталације/надградње/брисања:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Заједничке опције за све rpm режиме и извршне програме:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "једна врста упита/провере сме бити урађена одједном"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "неочекиване заставице упита"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "неочекиван облик упита"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "неочекивани извор упита"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "само један главни режим сме бити наведен"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr "само инсталација, надградња, rmsource и rmspec могу бити приморани"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "датотеке смеју бити премештане само током инсталације пакета"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "не може се користити --prefix уз --relocate или --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate и --excludepath могу бити употребљене само при инсталацији нових "
 "пакета"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix може бити употребљена само при инсталацији нових пакета"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "аргументи за --prefix морају почети знаком /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "може се навести само једна од --excludedocs или --includedocs"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches може бити наведена само током брисања пакета"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles може бити наведена само током инсталације пакета"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb може бити наведена само током инсталације и брисања пакета"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -190,7 +191,7 @@ msgstr ""
 "опције искључивања скрипте могу бити наведене само током инсталације и "
 "брисања пакета"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -198,46 +199,36 @@ msgstr ""
 "опције искључивања окидача могу бити наведене само током инсталације и "
 "брисања пакета"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps може бити наведена само током прављења, поновног прављења, поновног "
-"компилирања, брисања, и провере пакета"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test може бити наведена само током инсталације, брисања, и прављења пакета"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) може бити наведена само током инсталације, брисања, упита, и "
-"поновног прављења базе података"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb може бити наведена само током инсталације и брисања пакета"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "аргументи за --root (-r) морају почети знаком /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "нема задатих пакета за брисање"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "нема задатих пакета за инсталацију"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "нема задатих аргумената за упит"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "нема задатих аргумената за проверу"
 
@@ -378,7 +369,7 @@ msgstr "уклони датотеку спецификације по заврш
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "прескочи право до одређене фазе (само за c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "премости циљну платформу"
 
@@ -435,92 +426,127 @@ msgstr "Правим циљне платформе: %s\n"
 msgid "Building for target %s\n"
 msgstr "Правим за циљ %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "иницијализуј базу података"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "поново направи обрнуте спискове базе података из заглавља инсталираних пакета"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "провера датотека базе података"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Опције базе података:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "провери потписе пакета"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "увези ојачани јавни кључ"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Опције потписа:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "нема задатих аргумената"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "инсталирај пакет(е)"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "потпиши пакет(е) (истоветно са --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "обриши потписе пакета"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Опције потписа:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Не могу да извршим %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Морате поставити „%%_gpg_name“ у макро датотеци\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Унесите лозинку: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Лозинка је добра.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Неуспела провера лозинке\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "испитај датотеку спецификације"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "користи следећи облик упита"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Опције потписа:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Не могу да отворим temp датотеку.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Извршавам(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Извршавање %s није успело (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Лош статус излаза из %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -723,32 +749,32 @@ msgstr "Преклапање није дозвољено: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Датотека није пронађена поклапањем: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Не могу да отворим %%files датотеку %s: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "ред: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Лоша датотека: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Лош власник/група: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Проверавам за незапаковане датотеке: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -757,12 +783,12 @@ msgstr ""
 "Пронађене су инсталиране (али незапаковане) датотеке:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Обрађујем датотеке: %s-%s-%s.%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Бинарне датотеке зависне од архитектуре у noarch пакету\n"
 
@@ -981,30 +1007,30 @@ msgstr "недостаје име у %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "нема описа у %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "ред %d: Грешка при тумачењу %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "ред %d: Лоша опција %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "ред %d: Превише имена: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "ред %d: Пакет не постоји: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "ред %d: Други опис\n"
@@ -1089,97 +1115,97 @@ msgstr "Не могу да прочитам икону %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Непозната врста иконе: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "ред %d: Ознака прихвата само један жетон: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "ред %d: Недозвољени знак „-“ у %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "ред %d: Недозвољени знак „-“ у %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "ред %d: Недозвољени знак „-“ у %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "ред %d: Лоше обликована ознака: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "ред %d: Празна ознака: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "ред %d: Префикси се не смеју завршавати са „/“: %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "ред %d: Docdir мора почети са „/“: %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "ред %d: Поље епохе мора бити број без предзнака: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "ред %d: Лоши %s: квалификатори: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "ред %d: Лош облик за BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "ред %d: Само noarch подпакети су подржани: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Интерна грешка: Лажна ознака %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "ред %d: Неопходна верзија: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Лоша спецификација пакета: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Пакет већ постоји: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "ред %d: Непозната ознака: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} не може бити празно\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} не може бити „/“\n"
@@ -1238,7 +1264,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Неисправан број закрпе %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "ред %d: други %%prep\n"
@@ -1310,31 +1336,31 @@ msgstr "Не могу да отворим %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Отворен %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean враћа %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Добио %%else без %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Добио %%endif без %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "лоше обликована %%include наредба\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Нису пронађене усаглашене архитектуре за прављење\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Пакет нема %%description: %s\n"
@@ -1381,27 +1407,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Грешка у тумачењу %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Извршавам(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Недостаје %s у %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Превише аргумената у реду података на %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Обрађујем датотеке: %s-%s-%s.%s\n"
@@ -1426,7 +1452,7 @@ msgstr "Не могу да променим директоријум на %s: %s
 msgid "Couldn't exec %s: %s\n"
 msgstr "Не могу да извршим %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Не могу да одвојим %s: %s\n"
@@ -1476,7 +1502,7 @@ msgstr "Проналазак %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Неуспело тражење %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "упит на датотеком спецификације %s није успео, не могу да протумачим\n"
@@ -1753,91 +1779,99 @@ msgstr "%s је Делта RPM и не може се директно инста
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Неподржан терет (%s) у пакету %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "унапред дефинисани MACRO са вредношћу EXPR"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "„MACRO EXPR“"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "дефинише MACRO са вредношћу EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "испиши макро проширење за EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "„EXPR“"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "читај <FILE:...> уместо подразумеваних датотека"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "немој проверавати сажетак(е) пакета"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "немој проверавати заглавље(а) базе података по добављању"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "немој проверавати потпис(е) пакета"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "пошаљи stdout ка CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "користи ROOT као директоријум највишег нивоа"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "прикажи ознаке познатих упита"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "прикажи коначну конфигурацију за rpmrc и macro"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "пружа мање детаљан излаз"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "пружа детаљнији излаз"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "напиши која се rpm верзија користи"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "отклони грешке у машини стања датотеке товара"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "отклони грешке за rpmio У/И"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: табела опција није добро подешена (%d)\n"
@@ -1858,16 +1892,16 @@ msgstr "премештања морају садржати ="
 msgid "relocations must have a / following the ="
 msgstr "премештања морају имати / након ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "додај предложене пакете трансакцији"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "инсталирај све датотеке, чак и подешавања која би иначе могла бити прескочена"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1875,201 +1909,197 @@ msgstr ""
 "уклони све пакете који одговарају <package> (обично се пријављује грешка ако "
 "<package> одређује више пакета)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "немој извршити скриптицу(е) пакета"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "премести датотеке у пакету који се не може преместити"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "штампај петље зависности као упозорење"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "избриши (деинсталирај) пакет"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<package>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "немој инсталирати датотеке подешавања"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "немој да инсталираш документацију"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "прескочи датотеке које садрже компоненту <path> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<path>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "откриј сукобе датотека између пакета"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "скраћеница за --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "надгради пакете ако су већ инсталирани"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<packagefile>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "исписуј знак тарабе док се пакет инсталира (добро уз -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "немој проверавати архитектуру пакета"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "немој проверавати оперативни систем пакета"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "немој проверавати простор на диску пре инсталације"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "инсталирај документацију"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "инсталирај пакет(е)"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "ажурирај базу података, али немој мењати систем датотека"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "немој проверавати зависности пакета"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "немој проверавати MD5 сажетке датотека"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "немој проверавати MD5 сажетке датотека"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "немој инсталирати безбедносне контексте датотека"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "немој преуређивати редослед инсталације пакета ради задовољавања зависности"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "немој предлагати решење(а) недостајућим зависностима"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "немој извршити %%pre скриптицу (ако постоји)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "немој извршити %%post скриптицу (ако постоји)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "немој извршити %%preun скриптицу (ако постоји)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "немој извршити %%postun скриптицу (ако постоји)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "немој извршити ниједну скриптицу(е) коју активира овај пакет"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "немој извршити ниједну %%triggerprein скриптицу(е)"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "немој извршити ниједну %%triggerin скриптицу(е)"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "немој извршити ниједну %%triggerun скриптицу(е)"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "немој извршити ниједну %%triggerpostun скриптицу(е)"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 "надгради на стару верзију пакета (--force код надградње ово ради самостално)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "исписуј проценте док се пакет инсталира"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "премести пакет у <dir>, ако се може преместити"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "премести датотеке из путање <old> у <new>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<old>=<new>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "занемари сукобе датотека између пакета"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "поново инсталирај ако је пакет већ присутан"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "немој инсталирати, али реци да ли би радило или не"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "надгради пакет(е)"
 
@@ -2158,10 +2188,6 @@ msgstr "испиши датотеке у пакету"
 msgid "skip %%ghost files"
 msgstr "прескочи %%ghost датотеке"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "користи следећи облик упита"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "прикажи стања наведених датотека"
@@ -2775,31 +2801,31 @@ msgstr "Молим вас контактирајте %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Не могу да отворим %s за читање: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "није уграђена подршка <lua> скриптица\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Не могу да направим привремену датотеку за %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Не могу да удвојим описника датотеке: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s скриптица није успела, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s скриптица није успела, сигнал %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s скриптица није успела, излазни статус %d\n"
@@ -2808,12 +2834,12 @@ msgstr "%s скриптица није успела, излазни статус
 msgid "Unknown format"
 msgstr "Непознат облик"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(инсталирано) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2915,11 +2941,11 @@ msgstr "Потврди потпис: ЛОШИ ПАРАМЕТРИ\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Потпис: НЕПОЗНАТ (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s није успело\n"
@@ -2994,144 +3020,134 @@ msgstr "| очекиван на крају израза"
 msgid "array iterator used with different sized arrays"
 msgstr "показивач низа коришћен са низовима различитих величина"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d није доступно\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "не могу да отворим %s индекс користећи db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "није постављен dbpath\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "грешка(%d) при добављању „%s“ слогова из %s индекса\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: прескачем"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "грешка(%d) при записивању слога #%d у %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec није успео: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp није успео: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: прескачем"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: оштећено заглавље #%u враћено -- прескачем.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "грешка(%d) при добављању „%s“ слогова из %s индекса\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "грешка(%d) при постављању заглавља #%d слога за %s уклањање\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "грешка(%d) при постављању заглавља #%d слога за %s уклањање\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: не могу да прочитам заглавље на 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "грешка(%d) при постављању „%s“ слогова из %s индекса\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "грешка(%d) при складиштењу слога „%s“ у %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "грешка(%d) при уклањању слога „%s“ из %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "грешка(%d) при заузимању новог примерка пакета\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "грешка(%d) при записивању слога %s у %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "није постављен dbpath"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "привремена база података %s већ постоји\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "неуспело креирање директоријума %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "заглавље #%u у бази податак је лоше -- прескачем.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "не могу да додам слог првобитно на %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "неуспело поновно прављење базе података: основна база података је остала на "
 "месту\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "неуспела замена старе базе података са новом базом података!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "замени датотеке у %s са датотекама из %s да вратиш у претходно стање"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "неуспело уклањање директоријума %s: %s\n"
@@ -3365,27 +3381,27 @@ msgstr "Датотека %s је мања од %u бајтова\n"
 msgid "failed to create directory"
 msgstr "неуспело креирање директоријума"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "неправилна синтакса у lua скриптици: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "неправилна синтакса у lua скрипти: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua скрипта није успела: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "неправилна синтакса у lua датотеци: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua удица није успела: %s\n"
@@ -3487,12 +3503,32 @@ msgstr "%s: неуспело читање манифеста: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "немој проверавати потпис заглавља+товара"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps може бити наведена само током прављења, поновног прављења, "
+#~ "поновног компилирања, брисања, и провере пакета"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) може бити наведена само током инсталације, брисања, упита, и "
+#~ "поновног прављења базе података"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "откриј сукобе датотека између пакета"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d није доступно\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "привремена база података %s већ постоји\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "испитај/провери пакет(е) са идентификатором датотеке"
 
-#~ msgid "query a spec file"
-#~ msgstr "испитај датотеку спецификације"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3505,12 +3541,6 @@ msgstr "немој проверавати потпис заглавља+това
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Циљани бафер је преоптерећен\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Опције потписа:"
-
-#~ msgid "Database options:"
-#~ msgstr "Опције базе података:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "нема датотека за потписивање\n"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 9986cff84..d61a40c76 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2009-04-06 22:38+0100\n"
 "Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzija %s\n"
@@ -65,124 +65,125 @@ msgstr "greška pri čitanju zaglavlja iz paketa\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "ne mogu da ponovo otvorim tovar: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "ispitaj/proveri paket(e) u grupi"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Opcije upita (sa -q ili --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Opcije provere (sa -V ili --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opcije instalacije/nadgradnje/brisanja:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Zajedničke opcije za sve rpm režime i izvršne programe:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "jedna vrsta upita/provere sme biti urađena odjednom"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "neočekivane zastavice upita"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "neočekivan oblik upita"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "neočekivani izvor upita"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "samo jedan glavni režim sme biti naveden"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr "samo instalacija, nadgradnja, rmsource i rmspec mogu biti primorani"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "datoteke smeju biti premeštane samo tokom instalacije paketa"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "ne može se koristiti --prefix uz --relocate ili --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate i --excludepath mogu biti upotrebljene samo pri instalaciji novih "
 "paketa"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix može biti upotrebljena samo pri instalaciji novih paketa"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti za --prefix moraju početi znakom /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "može se navesti samo jedna od --excludedocs ili --includedocs"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches može biti navedena samo tokom brisanja paketa"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles može biti navedena samo tokom instalacije paketa"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb može biti navedena samo tokom instalacije i brisanja paketa"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -190,7 +191,7 @@ msgstr ""
 "opcije isključivanja skripte mogu biti navedene samo tokom instalacije i "
 "brisanja paketa"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -198,47 +199,37 @@ msgstr ""
 "opcije isključivanja okidača mogu biti navedene samo tokom instalacije i "
 "brisanja paketa"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps može biti navedena samo tokom pravljenja, ponovnog pravljenja, "
-"ponovnog kompiliranja, brisanja, i provere paketa"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test može biti navedena samo tokom instalacije, brisanja, i pravljenja "
 "paketa"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) može biti navedena samo tokom instalacije, brisanja, upita, i "
-"ponovnog pravljenja baze podataka"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb može biti navedena samo tokom instalacije i brisanja paketa"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti za --root (-r) moraju početi znakom /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "nema zadatih paketa za brisanje"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "nema zadatih paketa za instalaciju"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "nema zadatih argumenata za upit"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "nema zadatih argumenata za proveru"
 
@@ -379,7 +370,7 @@ msgstr "ukloni datoteku specifikacije po završetku"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "preskoči pravo do određene faze (samo za c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "premosti ciljnu platformu"
 
@@ -436,93 +427,128 @@ msgstr "Pravim ciljne platforme: %s\n"
 msgid "Building for target %s\n"
 msgstr "Pravim za cilj %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "inicijalizuj bazu podataka"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr ""
 "ponovo napravi obrnute spiskove baze podataka iz zaglavlja instaliranih "
 "paketa"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "provera datoteka baze podataka"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Opcije baze podataka:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "proveri potpise paketa"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "uvezi ojačani javni ključ"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Opcije potpisa:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "nema zadatih argumenata"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "instaliraj paket(e)"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "potpiši paket(e) (istovetno sa --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "obriši potpise paketa"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Opcije potpisa:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ne mogu da izvršim %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Morate postaviti „%%_gpg_name“ u makro datoteci\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Unesite lozinku: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Lozinka je dobra.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Neuspela provera lozinke\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "ispitaj datoteku specifikacije"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "koristi sledeći oblik upita"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Opcije potpisa:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Ne mogu da otvorim temp datoteku.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Izvršavam(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Izvršavanje %s nije uspelo (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Loš status izlaza iz %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -725,32 +751,32 @@ msgstr "Preklapanje nije dozvoljeno: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Datoteka nije pronađena poklapanjem: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Ne mogu da otvorim %%files datoteku %s: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "red: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Loša datoteka: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Loš vlasnik/grupa: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Proveravam za nezapakovane datoteke: %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -759,12 +785,12 @@ msgstr ""
 "Pronađene su instalirane (ali nezapakovane) datoteke:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Obrađujem datoteke: %s-%s-%s.%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binarne datoteke zavisne od arhitekture u noarch paketu\n"
 
@@ -983,30 +1009,30 @@ msgstr "nedostaje ime u %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "nema opisa u %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "red %d: Greška pri tumačenju %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "red %d: Loša opcija %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "red %d: Previše imena: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "red %d: Paket ne postoji: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "red %d: Drugi opis\n"
@@ -1091,97 +1117,97 @@ msgstr "Ne mogu da pročitam ikonu %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Nepoznata vrsta ikone: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "red %d: Oznaka prihvata samo jedan žeton: %s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "red %d: Nedozvoljeni znak „-“ u %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "red %d: Nedozvoljeni znak „-“ u %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "red %d: Nedozvoljeni znak „-“ u %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "red %d: Loše oblikovana oznaka: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "red %d: Prazna oznaka: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "red %d: Prefiksi se ne smeju završavati sa „/“: %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "red %d: Docdir mora početi sa „/“: %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "red %d: Polje epohe mora biti broj bez predznaka: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "red %d: Loši %s: kvalifikatori: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "red %d: Loš oblik za BuildArchitecture: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "red %d: Samo noarch podpaketi su podržani: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Interna greška: Lažna oznaka %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "red %d: Neophodna verzija: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Loša specifikacija paketa: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket već postoji: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "red %d: Nepoznata oznaka: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} ne može biti prazno\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} ne može biti „/“\n"
@@ -1240,7 +1266,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Neispravan broj zakrpe %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "red %d: drugi %%prep\n"
@@ -1312,31 +1338,31 @@ msgstr "Ne mogu da otvorim %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Otvoren %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean vraća %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d: Dobio %%else bez %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d: Dobio %%endif bez %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "loše oblikovana %%include naredba\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Nisu pronađene usaglašene arhitekture za pravljenje\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket nema %%description: %s\n"
@@ -1383,27 +1409,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Greška u tumačenju %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "Izvršavam(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "Nedostaje %s u %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "Previše argumenata u redu podataka na %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Obrađujem datoteke: %s-%s-%s.%s\n"
@@ -1428,7 +1454,7 @@ msgstr "Ne mogu da promenim direktorijum na %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ne mogu da izvršim %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Ne mogu da odvojim %s: %s\n"
@@ -1478,7 +1504,7 @@ msgstr "Pronalazak %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Neuspelo traženje %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "upit na datotekom specifikacije %s nije uspeo, ne mogu da protumačim\n"
@@ -1755,91 +1781,99 @@ msgstr "%s je Delta RPM i ne može se direktno instalirati\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nepodržan teret (%s) u paketu %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "unapred definisani MACRO sa vrednošću EXPR"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "„MACRO EXPR“"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "definiše MACRO sa vrednošću EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "ispiši makro proširenje za EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "„EXPR“"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "čitaj <FILE:...> umesto podrazumevanih datoteka"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FILE:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "nemoj proveravati sažetak(e) paketa"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "nemoj proveravati zaglavlje(a) baze podataka po dobavljanju"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "nemoj proveravati potpis(e) paketa"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "pošalji stdout ka CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "koristi ROOT kao direktorijum najvišeg nivoa"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "prikaži oznake poznatih upita"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "prikaži konačnu konfiguraciju za rpmrc i macro"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "pruža manje detaljan izlaz"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "pruža detaljniji izlaz"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "napiši koja se rpm verzija koristi"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "otkloni greške u mašini stanja datoteke tovara"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "otkloni greške za rpmio U/I"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: tabela opcija nije dobro podešena (%d)\n"
@@ -1860,17 +1894,17 @@ msgstr "premeštanja moraju sadržati ="
 msgid "relocations must have a / following the ="
 msgstr "premeštanja moraju imati / nakon ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "dodaj predložene pakete transakciji"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaliraj sve datoteke, čak i podešavanja koja bi inače mogla biti "
 "preskočena"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1878,201 +1912,197 @@ msgstr ""
 "ukloni sve pakete koji odgovaraju <package> (obično se prijavljuje greška "
 "ako <package> određuje više paketa)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "nemoj izvršiti skripticu(e) paketa"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "premesti datoteke u paketu koji se ne može premestiti"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "štampaj petlje zavisnosti kao upozorenje"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "izbriši (deinstaliraj) paket"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<package>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "nemoj instalirati datoteke podešavanja"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "nemoj da instaliraš dokumentaciju"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "preskoči datoteke koje sadrže komponentu <path> "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<path>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "otkrij sukobe datoteka između paketa"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skraćenica za --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "nadgradi pakete ako su već instalirani"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<packagefile>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "ispisuj znak tarabe dok se paket instalira (dobro uz -v)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "nemoj proveravati operativni sistem paketa"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "nemoj proveravati prostor na disku pre instalacije"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "instaliraj dokumentaciju"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "instaliraj paket(e)"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "ažuriraj bazu podataka, ali nemoj menjati sistem datoteka"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "nemoj proveravati MD5 sažetke datoteka"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "nemoj proveravati MD5 sažetke datoteka"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "nemoj instalirati bezbednosne kontekste datoteka"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "nemoj preuređivati redosled instalacije paketa radi zadovoljavanja zavisnosti"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "nemoj predlagati rešenje(a) nedostajućim zavisnostima"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nemoj izvršiti %%pre skripticu (ako postoji)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nemoj izvršiti %%post skripticu (ako postoji)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nemoj izvršiti %%preun skripticu (ako postoji)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nemoj izvršiti %%postun skripticu (ako postoji)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "nemoj izvršiti nijednu skripticu(e) koju aktivira ovaj paket"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nemoj izvršiti nijednu %%triggerprein skripticu(e)"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nemoj izvršiti nijednu %%triggerin skripticu(e)"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nemoj izvršiti nijednu %%triggerun skripticu(e)"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nemoj izvršiti nijednu %%triggerpostun skripticu(e)"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 "nadgradi na staru verziju paketa (--force kod nadgradnje ovo radi samostalno)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "ispisuj procente dok se paket instalira"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "premesti paket u <dir>, ako se može premestiti"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dir>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "premesti datoteke iz putanje <old> u <new>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<old>=<new>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "zanemari sukobe datoteka između paketa"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "ponovo instaliraj ako je paket već prisutan"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "nemoj instalirati, ali reci da li bi radilo ili ne"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "nadgradi paket(e)"
 
@@ -2161,10 +2191,6 @@ msgstr "ispiši datoteke u paketu"
 msgid "skip %%ghost files"
 msgstr "preskoči %%ghost datoteke"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "koristi sledeći oblik upita"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "prikaži stanja navedenih datoteka"
@@ -2779,31 +2805,31 @@ msgstr "Molim vas kontaktirajte %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Ne mogu da otvorim %s za čitanje: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "nije ugrađena podrška <lua> skriptica\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Ne mogu da napravim privremenu datoteku za %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Ne mogu da udvojim opisnika datoteke: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s skriptica nije uspela, waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s skriptica nije uspela, signal %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s skriptica nije uspela, izlazni status %d\n"
@@ -2812,12 +2838,12 @@ msgstr "%s skriptica nije uspela, izlazni status %d\n"
 msgid "Unknown format"
 msgstr "Nepoznat oblik"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(instalirano) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2919,11 +2945,11 @@ msgstr "Potvrdi potpis: LOŠI PARAMETRI\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Potpis: NEPOZNAT (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s nije uspelo\n"
@@ -2998,144 +3024,134 @@ msgstr "| očekivan na kraju izraza"
 msgid "array iterator used with different sized arrays"
 msgstr "pokazivač niza korišćen sa nizovima različitih veličina"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d nije dostupno\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "ne mogu da otvorim %s indeks koristeći db%d - %s (%d)\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "nije postavljen dbpath\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "greška(%d) pri dobavljanju „%s“ slogova iz %s indeksa\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: preskačem"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "greška(%d) pri zapisivanju sloga #%d u %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec nije uspeo: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp nije uspeo: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: preskačem"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: oštećeno zaglavlje #%u vraćeno -- preskačem.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "greška(%d) pri dobavljanju „%s“ slogova iz %s indeksa\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "greška(%d) pri postavljanju zaglavlja #%d sloga za %s uklanjanje\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "greška(%d) pri postavljanju zaglavlja #%d sloga za %s uklanjanje\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ne mogu da pročitam zaglavlje na 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "greška(%d) pri postavljanju „%s“ slogova iz %s indeksa\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "greška(%d) pri skladištenju sloga „%s“ u %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "greška(%d) pri uklanjanju sloga „%s“ iz %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "greška(%d) pri zauzimanju novog primerka paketa\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "greška(%d) pri zapisivanju sloga %s u %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "nije postavljen dbpath"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "privremena baza podataka %s već postoji\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "neuspelo kreiranje direktorijuma %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "zaglavlje #%u u bazi podatak je loše -- preskačem.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ne mogu da dodam slog prvobitno na %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "neuspelo ponovno pravljenje baze podataka: osnovna baza podataka je ostala "
 "na mestu\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "neuspela zamena stare baze podataka sa novom bazom podataka!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "zameni datoteke u %s sa datotekama iz %s da vratiš u prethodno stanje"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo uklanjanje direktorijuma %s: %s\n"
@@ -3369,27 +3385,27 @@ msgstr "Datoteka %s je manja od %u bajtova\n"
 msgid "failed to create directory"
 msgstr "neuspelo kreiranje direktorijuma"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "nepravilna sintaksa u lua skriptici: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "nepravilna sintaksa u lua skripti: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua skripta nije uspela: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "nepravilna sintaksa u lua datoteci: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua udica nije uspela: %s\n"
@@ -3491,12 +3507,32 @@ msgstr "%s: neuspelo čitanje manifesta: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "nemoj proveravati potpis zaglavlja+tovara"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps može biti navedena samo tokom pravljenja, ponovnog pravljenja, "
+#~ "ponovnog kompiliranja, brisanja, i provere paketa"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) može biti navedena samo tokom instalacije, brisanja, upita, i "
+#~ "ponovnog pravljenja baze podataka"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "otkrij sukobe datoteka između paketa"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d nije dostupno\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "privremena baza podataka %s već postoji\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "ispitaj/proveri paket(e) sa identifikatorom datoteke"
 
-#~ msgid "query a spec file"
-#~ msgstr "ispitaj datoteku specifikacije"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3509,12 +3545,6 @@ msgstr "nemoj proveravati potpis zaglavlja+tovara"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Ciljani bafer je preopterećen\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Opcije potpisa:"
-
-#~ msgid "Database options:"
-#~ msgstr "Opcije baze podataka:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "nema datoteka za potpisivanje\n"
 
diff --git a/po/sv.po b/po/sv.po
index 64835b8b4..f98f34722 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2009-01-17 17:20+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
@@ -64,124 +64,125 @@ msgstr "fel vid l�sning av pakethuvud\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kan inte �ter�ppna lasten: %s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "fr�ga/verifiera paket i grupp"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Fr�geflaggor (med -q eller --query):"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Verifieringsflaggor (med -V eller --verify):"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Installations-/Uppdaterings-/Raderingsflaggor"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "Gemensamma flaggor f�r alla rpm-l�gen och bin�rer:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 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:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "ov�ntade fr�geflaggor"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "ov�ntat fr�geformat"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "ov�ntad fr�gek�lla"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "enbart ett huvudl�ge kan anges"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "filer kan relokeras endast under paketinstallation"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "kan inte anv�nda --prefix med --relocate eller --excludepath"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 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:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan endast anv�ndas n�r nya paket installeras"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "argument till --prefix m�ste b�rja med /"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "enbart en av --excludedocs och --includedocs kan anv�ndas"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan enbart anv�ndas n�r paket raderas"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan enbart anv�ndas vid paketinstallation"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 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:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -189,7 +190,7 @@ msgstr ""
 "skriptinaktiveringsflaggor kan enbart anv�ndas n�r paket installeras eller "
 "raderas"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -197,45 +198,35 @@ msgstr ""
 "utl�sarinaktiveringsflaggor kan enbart anv�ndas n�r paket installeras eller "
 "raderas"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps kan enbart anv�ndas n�r paket byggs, byggs om, kompileras om, "
-"installeras, raderas eller verifieras"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr "--test kan enbart anv�ndas n�r paket installeras, raderas eller byggs"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr ""
-"--root (-r) kan enbart anv�ndas n�r paket installeras, raderas, fr�gas eller "
-"databasen byggs om"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb kan enbart anv�ndas n�r paket installeras eller raderas"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argument till --root (-r) m�ste b�rja med /"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "inga paket angivna att radera"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "inga paket angivna f�r installation"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna f�r fr�ga"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna f�r verifiering"
 
@@ -378,7 +369,7 @@ msgstr "ta bort specfil efter�t"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "g� direkt till angivet steg (endast f�r c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "�sidos�tt m�lplattform"
 
@@ -435,91 +426,126 @@ msgstr "Bygger m�lplattformar: %s\n"
 msgid "Building for target %s\n"
 msgstr "Bygger f�r m�let %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "initiera databas"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "bygg om databasens inverterade listor fr�n installerade pakets huvuden"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "verifiera databasfiler"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Databasflaggor:"
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "verifiera paketsignatur(er)"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "importera en publik nyckel med skal"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "Signaturflaggor:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "inga argument angivna"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "installera paket"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signera paket (detsamma som --addsign)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "tag bort paketsignaturer"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "Signaturflaggor:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunde inte k�ra %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Du m�ste s�tta \"%%_gpg_name\" i din makrofil\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Ange l�senfras: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "L�senfrasen �r ok.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Kontrollen av l�senfrasen misslyckades\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "fr�ga en specfil"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "anv�nd f�ljande fr�geformat"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "Signaturflaggor:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Kan inte �ppna tempor�r fil.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "K�r(%s): %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "K�rning (exec) av %s misslyckades (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "D�lig slutstatus fr�n %s (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -722,32 +748,32 @@ msgstr "Matchning inte till�tet: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Hittade ingen fil vid matchningen: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Kunde inte �ppna %%files-fil %s: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "rad: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Felaktig fil: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Felaktig �gare/grupp: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Letar efter opackade fil(er): %s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -756,12 +782,12 @@ msgstr ""
 "Installerade (men opaketerade) filer funna:\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "Bearbetar filer: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -980,30 +1006,30 @@ msgstr "saknat namn i %%changelog\n"
 msgid "no description in %%changelog\n"
 msgstr "ingen beskrivning i %%changelog\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "rad %d: Fel i tolkning av %%description: %s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "rad %d: otill�ten flagga %s: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "rad %d: F�r m�nga namn: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "rad %d: Paketet existerar inte: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "rad %d: En andra beskrivning\n"
@@ -1088,97 +1114,97 @@ msgstr "Kan inte l�sa ikon %s: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "Ok�nd ikontyp: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, 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:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "rad %d: Otill�tet tecken \"-\" i %s: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "rad %d: Otill�tet tecken \"-\" i %s: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "rad %d: Otill�tet tecken \"-\" i %s: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "rad %d: Felaktig tagg: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "rad %d: Tom tagg: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, 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:747
+#: build/parsePreamble.c:722
 #, 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:760
+#: build/parsePreamble.c:735
 #, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "rad %d: Epoch-f�lt m�ste vara ett teckenl�st tal: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "rad %d: Felaktigt %s: best�mningar: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "rad %d: Felaktigt BuildArchitecture-format: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr "rad %d: Endast noarch-underpaket st�ds: %s\n"
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "Internt fel: felaktig tagg %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "rad %d: Version kr�vs: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Felaktig paketangivelse %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paketet existerar redan: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "rad %d: Ok�nd tagg: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "%%{buildroot} fick inte vara tom\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "%%{buildroot} kan inte vara \"/\"\n"
@@ -1237,7 +1263,7 @@ msgstr "%s: %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "Felaktigt patch-nummer %s: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "rad %d: andra %%prep\n"
@@ -1309,31 +1335,31 @@ msgstr "Kan inte �ppna %s: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "Oavslutat %%if\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean returnerar %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, 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:368
+#: build/parseSpec.c:359
 #, 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:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "felformaterad %%include-sats\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Hittade inga kompatibla arkitekturer att bygga\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paketet har ingen %%description: %s\n"
@@ -1380,27 +1406,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "Fel i tolkning av %%setup: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "K�r(%s): %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "%s saknas i %s %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "F�r m�nga argument i datarad vid %s:%d\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "Bearbetar filer: %s-%s-%s\n"
@@ -1425,7 +1451,7 @@ msgstr "Kunde inte �ndra katalog till %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunde inte k�ra %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Kunde inte grena (fork) %s: %s\n"
@@ -1475,7 +1501,7 @@ msgstr "Letar efter %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "Misslyckades med att hitta %s:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "fr�ga av specfil %s misslyckades, kan inte tolka\n"
@@ -1754,91 +1780,99 @@ msgstr "%s �r en delta-RPM och kan inte installeras direkt\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Ej st�dd last (%s) i paket %s\n"
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "f�rdefiniera MAKRO till v�rdet UTTR"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "'MAKRO UTTR'"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "definiera MAKRO till v�rdet UTTR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "skriv ut makroexpansion av UTTR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "'UTTR'"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "l�s <FIL:...> ist�llet f�r standardfil(er)"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<FIL:...>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "verifiera inte paketkontrollsummor"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "verifiera inte databashuvuden n�r de h�mtas"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "verifiera inte paketsignatur(er)"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "skicka standard ut till KMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "KMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "anv�nd ROT som toppniv�katalog"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "visa k�nda fr�getaggar"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "visa slutliga rpmrc- och makrokonfigurationer"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "visa mindre detaljerad utdata"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "visa mer detaljerad utdata"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "visa vilken version av rpm som anv�nds"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "fels�k lastfilstillst�ndsmaskin"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "fels�k rpmio I/O"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: flaggtabell felkonfigurerad (%d)\n"
@@ -1859,16 +1893,16 @@ msgstr "omflyttningar m�ste inneh�lla ett ="
 msgid "relocations must have a / following the ="
 msgstr "omflyttningar m�ste ha ett / efter ="
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "l�gg till f�reslagna paket till transaktion"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1876,162 +1910,158 @@ msgstr ""
 "ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
 "anger flera paket)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "k�r inte paketskript"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "relokera filer i ej relokerbart paket"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "skriv beroendecykler som varningar"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "radera (avinstallera) paket"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<paket>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "installera inte konfigurationsfiler"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "installera inte dokumentation"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "hoppa �ver filer med inledande <s�kv�g>"
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<s�kv�g>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "uppt�ck filkonflikter mellan paket"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "kortform f�r --replacepkgs --replacefiles"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "uppgradera paket om redan installerade"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<paketfil>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 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:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "verifiera inte paketarkitektur"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "verifiera inte paketets operativsystem"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "kontrollera inte diskutrymme f�re installation"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "installera dokumentation"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "installera paket"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "uppdatera databasen, men �ndra inte filsystemet"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "verifiera inte MD5-summor f�r filer"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "verifiera inte MD5-summor f�r filer"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "installera inte fils�kerhetskontexter"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "flytta inte om paketinstallationen f�r att tillfredsst�lla beroenden"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "f�resl� inte l�sning(ar) p� saknade beroenden"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "utf�r inte (eventuellt) %%pre-skript"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "utf�r inte (eventuellt) %%post-skript"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "utf�r inte (eventuellt) %%preun-skript"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "utf�r inte (eventuellt) %%postun-skript"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "k�r inte skript utl�sta av detta paket"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "k�r inte %%triggerprein-skript"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "k�r inte %%triggerin-skript"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "k�r inte %%triggerun-skript"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "k�r inte %%triggerpostun-skript"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2039,39 +2069,39 @@ msgstr ""
 "uppgradera till en gammal version av paketet (--force vid uppgraderingar g�r "
 "detta automatiskt)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "skriv procent allt eftersom paketet installeras"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "flytta paketet till <katalog>, om flyttbart"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<kat>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "relokera filer fr�n <gammal> till <ny>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<gammal>=<ny>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "ingorera filkonflikter mellan paket"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "ominstallera n�r paketet redan �r installerat"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "uppgradera paket"
 
@@ -2160,10 +2190,6 @@ msgstr "lista filer i paketet"
 msgid "skip %%ghost files"
 msgstr "hoppa �ver %%ghost-filer"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "anv�nd f�ljande fr�geformat"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "visa tillst�nd f�r de listade filerna"
@@ -2773,31 +2799,31 @@ msgstr "Var god kontakta %s\n"
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "Kan inte �ppna %s f�r l�sning: %m.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua>-skriptst�d �r inte inbyggt\n"
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "Kunde inte skapa tempor�rfil f�r %s: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "Kunde inte duplicera filbeskrivare: %s: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s-skript misslyckades, waitpid(%d) rk %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s-skript misslyckades, signal %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s-skript misslyckades, slutstatus %d\n"
@@ -2806,12 +2832,12 @@ msgstr "%s-skript misslyckades, slutstatus %d\n"
 msgid "Unknown format"
 msgstr "Ok�nt format"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(installerat) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2913,11 +2939,11 @@ msgstr "Verifiera signatur: FELAKTIGA PARAMETRAR\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: OK�ND (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s misslyckades\n"
@@ -2992,142 +3018,132 @@ msgstr "| f�rv�ntades vid slutet p� uttryck"
 msgid "array iterator used with different sized arrays"
 msgstr "vektoriterator anv�nd med vektor av annan storlek"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr "dbiOpen: dbapi %d �r inte tillg�ngligt\n"
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, 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"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "ingen dbpath har satts\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, 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"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader: hoppar �ver"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "fel(%d) n�r post nr. %d sparades i %s\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: regexec misslyckades: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: regcomp misslyckades: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator: hoppar �ver"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb: skadat huvud nr. %u h�mtat -- hoppar �ver.\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "fel(%d) n�r \"%s\"-poster h�mtades fr�n %s-indexet\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "fel(%d) n�r huvudpost nr. %d  f�r %s skulle tas bort\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "fel(%d) n�r huvudpost nr. %d  f�r %s skulle tas bort\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan inte l�sa huvud vid 0x%x\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, 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"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "fel(%d) n�r post \"%s\" sparades i %s\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "fel(%d) n�r post \"%s\" togs bort fr�n %s\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fel(%d) vid allokering av ny paketinstans\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fel(%d) n�r post %s sparades i %s\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "tillf�llig databas %s existerar redan\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "misslyckades att skapa katalogen %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "huvud nr. %u i databasen �r felaktigt -- hoppar �ver.\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kan inte l�gga till post ursprungligen vid %u\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ers�tta gammal databas med ny databas!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, 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"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3361,27 +3377,27 @@ msgstr "Filen %s �r mindre �n %u byte\n"
 msgid "failed to create directory"
 msgstr "misslyckades att skapa katalog"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "felaktig syntax i lua-skript: %s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "felaktig syntax i lua-skript: %s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, c-format
 msgid "lua script failed: %s\n"
 msgstr "lua-skript misslyckades: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "felaktig syntax i lua-fil: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, c-format
 msgid "lua hook failed: %s\n"
 msgstr "lua-hake misslyckades: %s\n"
@@ -3483,12 +3499,32 @@ msgstr "%s: l�sning av paketlista misslyckades: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verifiera inte huvud+lastsignatur"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps kan enbart anv�ndas n�r paket byggs, byggs om, kompileras om, "
+#~ "installeras, raderas eller verifieras"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) kan enbart anv�ndas n�r paket installeras, raderas, fr�gas "
+#~ "eller databasen byggs om"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "uppt�ck filkonflikter mellan paket"
+
+#~ msgid "dbiOpen: dbapi %d not available\n"
+#~ msgstr "dbiOpen: dbapi %d �r inte tillg�ngligt\n"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "tillf�llig databas %s existerar redan\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "fr�ga/verifiera paket med filidentifierare"
 
-#~ msgid "query a spec file"
-#~ msgstr "fr�ga en specfil"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3501,12 +3537,6 @@ msgstr "verifiera inte huvud+lastsignatur"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "M�lbuffert �versv�mmad\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "Signaturflaggor:"
-
-#~ msgid "Database options:"
-#~ msgstr "Databasflaggor:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "inga filer att signera\n"
 
diff --git a/po/tr.po b/po/tr.po
index a429652ec..d02dc8b71 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\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"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM S�r�m %s\n"
@@ -58,128 +58,129 @@ msgstr "paketten ba�l�k okunmas� s�ras�nda hata olu�tu\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "payload %s tekrar a��lam�yor\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "gruptaki paketleri sorgular/denetler"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "Sorgulama se�enekleri (-q ya da --query ile)"
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "Denetleme se�enekleri (-V ya da --verify ile)"
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "Kurma/G�ncelleme/Kald�rma se�enekleri:"
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "T�m rpm kipleri i�in ortak se�enekler:"
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "bir anda sadece bir tarz sorgulama/denetleme yap�labilir"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "beklenmeyen sorgulama bayraklar�"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "beklenmeyen sorgulama bi�emi"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "beklenmeyen sorgulama kayna��"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "sadece bir ana kip belirtilebilir"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr ""
 "sadece  kaynak ve spec silme i�lemleri, kurma, g�ncelleme i�lemleri i�in "
 "zorlanabilir"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr ""
 "dosyalar sadece paket kurulumu s�ras�nda yeni yerlerine yerle�tirilebilir"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr ""
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate ve --excludepath sadece yeni paket kurulumunda kullan�labilir"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix sadece yeni paketlerin kurulmas� s�ras�nda kullan�labilir"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ile belirtilenler '/' ile ba�lamal�"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ve --includedocs bir arada kullan�lamaz"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sadece paket kurulumu s�ras�nda kullan�labilir"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 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:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -187,7 +188,7 @@ msgstr ""
 "betik iptal etme se�enekleri sadece paketin kurulmas� ve silinmesi s�ras�nda "
 "kullan�labilir"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -195,48 +196,39 @@ msgstr ""
 "tetikleme iptal se�enekleri sadece paketin kurulmas� ve silinmesi s�ras�nda "
 "kullan�labilir"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps sadece paket olu�turma, yeniden olu�turma, yeniden derleme, "
-"kurulum, kald�rma ve denetleme i�lemlerinde kullan�labilir"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr ""
 "--test sadece paket kurulumu, kald�r�lmas� ve olu�turulmas� i�lemlerinde "
 "kullan�labilir"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
 msgstr ""
-"--root (-r) sadece kurulum, kald�rma, sorgulama ve yeniden veritaban� "
-"olu�turma i�lemlerinde kullan�labilir"
+"--justdb sadece paket kurulumu ve kald�r�lmas� s�ras�nda kullan�labilir"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ile verilenler '/' ile ba�lamal�"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "y�klenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "y�klenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "sorgulama i�in hi� arg�man belirtilmedi"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "denetleme i�in hi� arg�man belirtilmedi"
 
@@ -387,7 +379,7 @@ msgstr "i�lem sonunda spec dosyas�n� siler"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "do�rudan belirtilen ad�ma atlar (sadece c ve i i�in)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "hedef platforma zorlar"
 
@@ -446,95 +438,130 @@ msgstr "Hedef platformlar derleniyor: %s\n"
 msgid "Building for target %s\n"
 msgstr "%s i�in derleniyor\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "veritaban�n� ba�lang�� durumuna getirir"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "kurulu paket ba�l�klar�ndan veritaban� listelerini yeniden olu�turur"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "veritaban� dosyaral�n� do�rular"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "Veritaban� se�enekleri:"
+
+#: rpmkeys.c:23
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "paket imzas�n� denetler"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr ""
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "�mza se�enekleri:"
+
+#: rpmkeys.c:61 rpmsign.c:143
 #, fuzzy
 msgid "no arguments given"
 msgstr "sorgulama i�in hi� arg�man belirtilmedi"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "paketi kurar"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "paketi imzalar (mevcut imza kald�r�l�r)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 #, fuzzy
 msgid "delete package signatures"
 msgstr "paket imzas�n� denetler"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "�mza se�enekleri:"
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Makro dosyan�zda \"%%_pgp_name\" tan�mlanm�� olmal�\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "Anahtar parolas�n� girin: "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "Anahtar parolas� do�ru.\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "Anahtar parolas� kontrol� ba�ar�s�z\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "bir spec dosyas�n� sorgular"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "izleyen sorgulama bi�imini kullan�r"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "�mza se�enekleri:"
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "Ge�ici dosya a��lamad�.\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "%s icra ediliyor: %s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s 'in icras� ba�ar�s�z (%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s ��k���nda hata (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -737,44 +764,44 @@ msgstr "sat�r %d: Dosya ad� uygun de�il: %s\n"
 msgid "File not found by glob: %s\n"
 msgstr "Dosya glob taraf�ndan bulunamad�: %s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "%%files dosya %s dosyas�nda a��lamad�: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "sat�r: %s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Dosya hatal�: %s: %s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Kullan�c�/grup hatal�: %s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, 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:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "��lenen dosyalar: %s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -996,30 +1023,30 @@ msgstr "%%changelog i�inde isim yok\n"
 msgid "no description in %%changelog\n"
 msgstr "%%changelog i�inde a��klama yok\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "sat�r %d: %%description ayr��t�r�l�rken hata: %s�\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "sat�r %d: %s se�ene�i hatal�: %s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "sat�r %d: �sim say�s� fazla: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "sat�r %d: Paket yok: %s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "sat�r %d: �kinci a��klama\n"
@@ -1104,97 +1131,97 @@ msgstr "%s k�sayol simgesi okunamad�: %s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "bilinmeyen k�sayol simgesi t�r�: %s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, 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:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "sat�r %d:  %s i�inde '-' karakteri kurald���: %s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "sat�r %d:  %s i�inde '-' karakteri kurald���: %s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "sat�r %d:  %s i�inde '-' karakteri kurald���: %s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "sat�r %d: Etiket bozuk: %s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "sat�r %d: Etiket bo�: %s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "sat�r %d: �nekler \"/\" ile bitemez: %s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "sat�r %d: Docdir '/' ile ba�lamal�: %s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "sat�r %d: Epoch/Serial alan� bir say� olmal�: %s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "sat�r %d: %s hatal�: niteleyiciler: %s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "sat�r %d: BuildArchitecture bi�imi hatal�: %s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "��sel hata: %d etiketi sahte\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "sat�r %d: S�r�m gerekli: %s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "Paket �zellikleri hatal�: %s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "Paket zaten var: %s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "sat�r %d: Bilinmeyen etiket: %s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot \"/\" olamaz: %s\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot \"/\" olamaz: %s\n"
@@ -1254,7 +1281,7 @@ msgstr "dosya %s: %s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "ge�ersiz paket numaras�: %s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "sat�r %d: %%prep saniye\n"
@@ -1327,31 +1354,31 @@ msgstr "%s a��lamad�: %s\n"
 msgid "Unclosed %%if\n"
 msgstr "%%if kapanmam��\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean %d ile d�ner\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, 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:368
+#: build/parseSpec.c:359
 #, 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:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "%%include deyimi bozuk\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "Kurgulamak i�in uyumlu mimari yok\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket %%description i�ermiyor: %s\n"
@@ -1398,27 +1425,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "%%setup ��z�mlenirken hata: %s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "%s icra ediliyor: %s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "%s i�inde '(' yok: %s\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "%s:%d - veri sat�r�nda �ok fazla arg�man\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "��lenen dosyalar: %s-%s-%s\n"
@@ -1443,7 +1470,7 @@ msgstr "%s icra edilemedi: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s ayr�lamad�: %s\n"
@@ -1493,7 +1520,7 @@ msgstr "%s aran�yor: (%s kullanarak)...\n"
 msgid "Failed to find %s:\n"
 msgstr "%s bulunamad�:\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s spec dosyas�n�n sorgulanmas� ba�ar�s�z, ��z�mlenemiyor\n"
@@ -1772,99 +1799,107 @@ msgstr "%s y�klenemedi\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr ""
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 #, fuzzy
 msgid "print macro expansion of EXPR"
 msgstr "<ifade>+ i�in makro a��l�m�n� g�sterir"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr ""
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "�ntan�ml� makro dosyas� yerine <dosya:...> okunur"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr ""
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 #, fuzzy
 msgid "don't verify package digest(s)"
 msgstr "paket ba��ml�l�klar� do�rulanmaz"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 #, fuzzy
 msgid "don't verify database header(s) when retrieved"
 msgstr "paket mimarisi denetlenmez"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 #, fuzzy
 msgid "don't verify package signature(s)"
 msgstr "paket imzas�n� denetler"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 #, fuzzy
 msgid "send stdout to CMD"
 msgstr "standart ��kt�y� <KOMUT>'a g�nderir"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr ""
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 #, fuzzy
 msgid "use ROOT as top level directory"
 msgstr "�st d�zey dizin olarak <dizin> kullan�l�r"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr ""
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "tan�mlanm�� sorgulama etiketlerini g�sterir"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "son rpmrc ve makro yap�land�rmas�n� g�sterir"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "daha az ayr�nt�l� ��kt� sa�lar"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "daha ayr�nt�l� ��kt� sa�lar"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "Kullan�lan RPM s�r�m�n� verir"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 #, fuzzy
 msgid "debug payload file state machine"
 msgstr "hata ay�klama dosyas� durum motoru"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "rpmio G/� hata kontrolu"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1885,16 +1920,16 @@ msgstr "yeniden konumland�rma i�lemleri = i�ermelidir"
 msgid "relocations must have a / following the ="
 msgstr "yeniden konumland�rma i�in = den sonra bir / gerekir"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 #, fuzzy
 msgid "add suggested packages to transaction"
 msgstr "gruptaki paketleri sorgular/denetler"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 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:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1902,166 +1937,161 @@ 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:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "paket betikleri �al��t�r�lmaz"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 #, fuzzy
 msgid "relocate files in non-relocatable package"
 msgstr "yeniden konumlanamayan paketin dosyalar�n� yeniden konumland�r�r"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr ""
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "paketi kald�r�r"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<paket>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 #, fuzzy
 msgid "do not install configuration files"
 msgstr "t�m yap�land�rma dosyalar�n� listeler"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "belgeleri kurmaz"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "<dosyayolu> ile ba�layan dosyalar� atlar "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<dosyaYolu>"
 
 #: lib/poptI.c:152
-#, fuzzy
-msgid "detect file conflicts between packages"
-msgstr "yeniden konumlanamayan paketin dosyalar�n� yeniden konumland�r�r"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs --replacefiles i�in k�saltma"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "paket(ler) kurulu ise paket(ler)i g�nceller"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<paketDosyas�>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "paketin kurulma s�recini g�steren imler basar (-v ile)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "paket mimarisi denetlenmez"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "paketin ait oldu�u i�letim sistemini do�rulamaz"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "y�klemeden �nce yeterli disk alan� kontrolu yapmaz"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "paket ile gelen belgeleri kurar"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 #, fuzzy
 msgid "install package(s)"
 msgstr "paketi kurar"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 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:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "paket ba��ml�l�klar�n� denetlemez"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "dosyalar�n MD5 �z�mlemesi do�rulanmaz"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "dosyalar�n MD5 �z�mlemesi do�rulanmaz"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 #, fuzzy
 msgid "don't install file security contexts"
 msgstr "t�m yap�land�rma dosyalar�n� listeler"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 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:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "%%pre beti�i (varsa) �al��t�r�lmaz"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "%%post beti�i (varsa) �al��t�r�lmaz"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "%%preun beti�i (varsa) �al��t�r�lmaz"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "%%postun beti�i (varsa) �al��t�r�lmaz"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 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:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "hi�bir %%triggerprein beti�i �al��t�r�lmaz"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "hi�bir %%triggerin beti�i �al��t�r�lmaz."
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "hi�bir %%triggerun beti�i �al��t�r�lmaz."
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "hi�bir %%triggerpostun beti�i �al��t�r�lmaz."
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2069,39 +2099,39 @@ msgstr ""
 "paketin eski bir s�r�me g�ncellenmesini sa�lar (--force ayn� i�i otomatik "
 "yapar)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "kurulumun geli�imi y�zde olarak g�sterilir"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "e�er de�itirilebiliyorsa paketin yerini <dizin>'e de�i�tirir"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<dizin>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "dosyalar� <eski> dizininden kald�r�p <yeni> dizinine yerle�tirir"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<eski>=<yeni>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr ""
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "paketi yeniden kurar"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 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:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "paket g�nceller"
 
@@ -2197,10 +2227,6 @@ msgstr "paketteki dosyalar� g�sterir"
 msgid "skip %%ghost files"
 msgstr "%%ghost dosyalar� atlan�r"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "izleyen sorgulama bi�imini kullan�r"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "listelenmi� dosyalar�n durumunu g�sterir"
@@ -2818,31 +2844,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "%s okuma eri�imi i�in a��lamad�: %s.\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "%s ayr�lamad�: %s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "%s ayr�lamad�: %s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%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/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s beti�inin %s-%s-%s'den icras� ba�ar�s�z, ��k��ta durum %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%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"
@@ -2852,12 +2878,12 @@ msgstr "%s beti�inin %s-%s-%s'den icras� ba�ar�s�z, ��k��ta durum %d\n"
 msgid "Unknown format"
 msgstr "bilinmeyen etiket"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "y�klenmedi "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2959,11 +2985,11 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "�mza: boyut(%d)+iz(%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s ba�ar�s�z\n"
@@ -3038,144 +3064,134 @@ msgstr "ifadenin sonunda | gerekli"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "%s indeksi db%d - %s (%d) kullanarak a��lamad�\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "belirtilmi� bir dbpath de�eri yok\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "hata(%d): \"%s\" kay�t %s indeksinden al�n�yor\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, 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"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s: Fseek ba�ar�s�z: %s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s: a��lamad�: %s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr ""
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, 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"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "hata(%d): \"%s\" kay�t %s indeksinden al�n�yor\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "hata(%d): \"%s\" kay�t %s indeksinden al�n�yor\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "hata(%d): \"%s\" kay�t %s indeksinden al�n�yor\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x de ba�l�k okunamad�\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, 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"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, 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"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, fuzzy, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "hata(%d) %s kayd�n %s dosyas�ndan silinmesi\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "yeni paket �rne�ini tutma hatas�(%d)\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "hata(%d): %s kay�t %s i�ine yaz�l�yor\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "belirtilmi� bir dbpath yok"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "ge�ici veritaban� %s zaten mevcut\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "%s dizininin silinmesi ba�ar�s�z: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, fuzzy, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "veritaban�ndaki %u. kay�t hatal� -- atlan�yor\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kay�t �zg�n olarak %u e eklenemedi\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 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"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "eski veritaban�n�n yenisiyle de�i�tirilirmesi ba�ar�s�z!\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, 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"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s dizininin silinmesi ba�ar�s�z: %s\n"
@@ -3410,27 +3426,27 @@ msgstr "%s dosyas� %u bayttan k���k\n"
 msgid "failed to create directory"
 msgstr "%s dizininin silinmesi ba�ar�s�z: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr ""
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "- dizgelerde desteklenmez\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite ba�ar�s�z: %s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "ge�ersiz paket numaras�: %s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s: Fseek ba�ar�s�z: %s\n"
@@ -3534,13 +3550,31 @@ msgstr "%s: bildirge okuma ba�ar�s�z: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "paket imzas�n� denetler"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr ""
+#~ "--nodeps sadece paket olu�turma, yeniden olu�turma, yeniden derleme, "
+#~ "kurulum, kald�rma ve denetleme i�lemlerinde kullan�labilir"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr ""
+#~ "--root (-r) sadece kurulum, kald�rma, sorgulama ve yeniden veritaban� "
+#~ "olu�turma i�lemlerinde kullan�labilir"
+
+#, fuzzy
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "yeniden konumlanamayan paketin dosyalar�n� yeniden konumland�r�r"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "ge�ici veritaban� %s zaten mevcut\n"
+
 #, fuzzy
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "dosyay� i�eren paketleri sorgular/denetler"
 
-#~ msgid "query a spec file"
-#~ msgstr "bir spec dosyas�n� sorgular"
-
 #~ msgid "<spec>"
 #~ msgstr "<spec>"
 
@@ -3550,12 +3584,6 @@ msgstr "paket imzas�n� denetler"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "Hedef tampon bellek ta�t�\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "�mza se�enekleri:"
-
-#~ msgid "Database options:"
-#~ msgstr "Veritaban� se�enekleri:"
-
 #~ msgid "no files to sign\n"
 #~ msgstr "imzalanacak dosya yok\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 14ffed344..bdf45ef0e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.4.2\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2010-10-22 15:01+0300\n"
+"POT-Creation-Date: 2010-11-18 13:20+0200\n"
 "PO-Revision-Date: 2007-05-05 10:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "%s: %s\n"
 msgstr "%s：%s\n"
 
-#: cliutils.c:26 lib/poptALL.c:63
+#: cliutils.c:26 lib/poptALL.c:61
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM 版本 %s\n"
@@ -64,168 +64,163 @@ msgstr "讀取套件的表頭資訊時發生錯誤\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "無法重新開啟酬載：%s\n"
 
-#: rpmqv.c:45
+#: rpmqv.c:41
 #, fuzzy
 msgid "Query/Verify package selection options:"
 msgstr "查詢/校驗套件所屬的組別"
 
-#: rpmqv.c:50
+#: rpmqv.c:46
 msgid "Query options (with -q or --query):"
 msgstr "查詢選項 (使用 -q 或 --query)："
 
-#: rpmqv.c:55
+#: rpmqv.c:51
 msgid "Verify options (with -V or --verify):"
 msgstr "校驗選項 (使用 -V 或 --verify)："
 
-#: rpmqv.c:61
+#: rpmqv.c:57
 msgid "Install/Upgrade/Erase options:"
 msgstr "安裝/更新/清除選項："
 
-#: rpmqv.c:68 rpmbuild.c:217 rpmdb.c:22 rpmkeys.c:23 rpmsign.c:25
+#: rpmqv.c:64 rpmbuild.c:217 rpmdb.c:35 rpmkeys.c:39 rpmsign.c:37 rpmspec.c:45
 #: tools/rpmdeps.c:32 tools/rpmgraph.c:222
 msgid "Common options for all rpm modes and executables:"
 msgstr "用於所有 rpm 模式和可執行檔案的共同選項："
 
-#: rpmqv.c:125
+#: rpmqv.c:121
 msgid "one type of query/verify may be performed at a time"
 msgstr "只有查詢/校驗兩種工作模式能被同時選用"
 
-#: rpmqv.c:129
+#: rpmqv.c:125
 msgid "unexpected query flags"
 msgstr "不可預料的查詢旗標"
 
-#: rpmqv.c:132
+#: rpmqv.c:128
 msgid "unexpected query format"
 msgstr "不可預料的查詢格式"
 
-#: rpmqv.c:135
+#: rpmqv.c:131
 msgid "unexpected query source"
 msgstr "不可預料的查詢來源"
 
-#: rpmqv.c:146 rpmdb.c:64 rpmkeys.c:69 rpmsign.c:152
+#: rpmqv.c:142 rpmdb.c:70 rpmkeys.c:75 rpmsign.c:158
 msgid "only one major mode may be specified"
 msgstr "只能指定一個主要工作模式"
 
-#: rpmqv.c:157
-msgid "only installation, upgrading, rmsource and rmspec may be forced"
+#: rpmqv.c:153
+#, fuzzy
+msgid "only installation and upgrading may be forced"
 msgstr "只有安裝、更新、移除原始碼檔案、移除規格檔案幾種作業可被強制執行"
 
-#: rpmqv.c:159
+#: rpmqv.c:155
 msgid "files may only be relocated during package installation"
 msgstr "在套件安裝時檔案可以被重新部署"
 
-#: rpmqv.c:162
+#: rpmqv.c:158
 msgid "cannot use --prefix with --relocate or --excludepath"
 msgstr "--prefix 不能和 --relocate 或 --excludepath 同時使用"
 
-#: rpmqv.c:165
+#: rpmqv.c:161
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate 和 --excludepath 只能在安裝新軟體時使用"
 
-#: rpmqv.c:168
+#: rpmqv.c:164
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix 只能在安裝新軟體時使用"
 
-#: rpmqv.c:171
+#: rpmqv.c:167
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix 的引數必須以「/」開頭"
 
-#: rpmqv.c:174
+#: rpmqv.c:170
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) 選項只能在套件安裝時指定"
 
-#: rpmqv.c:178
+#: rpmqv.c:174
 msgid "--percent may only be specified during package installation"
 msgstr "--percent 選項只能在套件安裝時指定"
 
-#: rpmqv.c:182
+#: rpmqv.c:178
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs 選項只能在套件安裝時指定"
 
-#: rpmqv.c:186
+#: rpmqv.c:182
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs 選項只能在套件安裝時指定"
 
-#: rpmqv.c:190
+#: rpmqv.c:186
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs 選項只能在套件安裝時指定"
 
-#: rpmqv.c:194
+#: rpmqv.c:190
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs 和 --includedocs 兩個選項中只能指定一個"
 
-#: rpmqv.c:198
+#: rpmqv.c:194
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch 選項只能在套件安裝時指定"
 
-#: rpmqv.c:202
+#: rpmqv.c:198
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos 選項只能在套件安裝時指定"
 
-#: rpmqv.c:207
+#: rpmqv.c:203
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize 選項只能在套件安裝時指定"
 
-#: rpmqv.c:211
+#: rpmqv.c:207
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches 選項只能在套件清除時指定"
 
-#: rpmqv.c:215
+#: rpmqv.c:211
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles 選項只能在套件安裝時指定"
 
-#: rpmqv.c:220
+#: rpmqv.c:216
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb 選項只能在套件安裝和清除時指定"
 
-#: rpmqv.c:225
+#: rpmqv.c:221
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "與命令稿停用有關的選項只能在套件安裝和清除時指定"
 
-#: rpmqv.c:230
+#: rpmqv.c:226
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "與觸發停用有關的選項只能在套件安裝和清除時指定"
 
-#: rpmqv.c:234
-msgid ""
-"--nodeps may only be specified during package building, rebuilding, "
-"recompilation, installation,erasure, and verification"
-msgstr "--nodeps 選項只能在套件的組建、重建、重編譯、安裝、清除和校驗時指定"
-
-#: rpmqv.c:239
+#: rpmqv.c:230
+#, fuzzy
 msgid ""
-"--test may only be specified during package installation, erasure, and "
-"building"
+"--nodeps may only be specified during package installation, erasure, and "
+"verification"
 msgstr "--test 選項只能在套件的安裝、清除和組建時指定"
 
-#: rpmqv.c:244
-msgid ""
-"--root (-r) may only be specified during installation, erasure, querying, "
-"and database rebuilds"
-msgstr "--root(-r) 選項只能在套件的安裝、清除、查詢和資料庫重建時指定"
+#: rpmqv.c:234
+#, fuzzy
+msgid "--test may only be specified during package installation and erasure"
+msgstr "--justdb 選項只能在套件安裝和清除時指定"
 
-#: rpmqv.c:249 rpmbuild.c:547
+#: rpmqv.c:239 rpmbuild.c:547
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) 的引數必須以「/」開頭"
 
-#: rpmqv.c:266
+#: rpmqv.c:256
 msgid "no packages given for erase"
 msgstr "沒有指定要清除的套件名稱"
 
-#: rpmqv.c:300
+#: rpmqv.c:290
 msgid "no packages given for install"
 msgstr "沒有指定要安裝的套件名稱"
 
-#: rpmqv.c:312
+#: rpmqv.c:302 rpmspec.c:76
 msgid "no arguments given for query"
 msgstr "沒有指定查詢引數"
 
-#: rpmqv.c:324
+#: rpmqv.c:314
 msgid "no arguments given for verify"
 msgstr "沒有指定校驗引數"
 
@@ -362,7 +357,7 @@ msgstr "完成後移除規格檔案"
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "直接跳到指定的階段 (只有用於 c,i)"
 
-#: rpmbuild.c:194
+#: rpmbuild.c:194 rpmspec.c:31
 msgid "override target platform"
 msgstr "無視目標平台"
 
@@ -419,91 +414,126 @@ msgstr "組建目標平台：%s\n"
 msgid "Building for target %s\n"
 msgstr "組建目標 %s\n"
 
-#: rpmdb.c:24
+#: rpmdb.c:22
 msgid "initialize database"
 msgstr "初始化資料庫"
 
-#: rpmdb.c:26
+#: rpmdb.c:24
 msgid "rebuild database inverted lists from installed package headers"
 msgstr "從安裝的套件表頭重建資料庫的反相清單"
 
-#: rpmdb.c:29
+#: rpmdb.c:27
 msgid "verify database files"
 msgstr "驗證資料庫檔案"
 
-#: rpmkeys.c:25
+#: rpmdb.c:33
+msgid "Database options:"
+msgstr "資料庫選項："
+
+#: rpmkeys.c:23
 msgid "verify package signature(s)"
 msgstr "校驗套件簽名"
 
-#: rpmkeys.c:27
+#: rpmkeys.c:25
 msgid "import an armored public key"
 msgstr "匯入一個受保護的公鑰"
 
-#: rpmkeys.c:30 rpmkeys.c:32
+#: rpmkeys.c:28 rpmkeys.c:30
 msgid "list keys from RPM keyring"
 msgstr ""
 
-#: rpmkeys.c:55 rpmsign.c:137
+#: rpmkeys.c:37
+#, fuzzy
+msgid "Keyring options:"
+msgstr "簽名選項："
+
+#: rpmkeys.c:61 rpmsign.c:143
 msgid "no arguments given"
 msgstr "沒有指定引數"
 
-#: rpmsign.c:27
+#: rpmsign.c:25
 #, fuzzy
 msgid "sign package(s)"
 msgstr "安裝套件"
 
-#: rpmsign.c:29
+#: rpmsign.c:27
 msgid "sign package(s) (identical to --addsign)"
 msgstr "對套件簽名 (與 --addsign 含義相同)"
 
-#: rpmsign.c:31
+#: rpmsign.c:29
 msgid "delete package signatures"
 msgstr "刪除套件簽名"
 
-#: rpmsign.c:79 sign/rpmgensig.c:196
+#: rpmsign.c:35
+msgid "Signature options:"
+msgstr "簽名選項："
+
+#: rpmsign.c:85 sign/rpmgensig.c:196
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "無法執行 %s: %s\n"
 
-#: rpmsign.c:102
+#: rpmsign.c:108
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "您必須在您的巨集檔案中設定 \"%%_gpg_name\"\n"
 
-#: rpmsign.c:107
+#: rpmsign.c:113
 msgid "Enter pass phrase: "
 msgstr "輸入密文： "
 
-#: rpmsign.c:111
+#: rpmsign.c:117
 #, c-format
 msgid "Pass phrase is good.\n"
 msgstr "密文很好。\n"
 
-#: rpmsign.c:117
+#: rpmsign.c:123
 #, c-format
 msgid "Pass phrase check failed\n"
 msgstr "密文偵測失敗\n"
 
-#: build/build.c:133 build/pack.c:405
+#: rpmspec.c:25
+#, fuzzy
+msgid "query spec file(s)"
+msgstr "查詢一個規格檔案"
+
+#: rpmspec.c:27
+msgid "operate on binary rpms generated by spec (default)"
+msgstr ""
+
+#: rpmspec.c:29
+msgid "operate on source rpm generated by spec"
+msgstr ""
+
+#: rpmspec.c:33 lib/poptQV.c:195
+msgid "use the following query format"
+msgstr "使用以下的查詢格式"
+
+#: rpmspec.c:42
+#, fuzzy
+msgid "Spec options:"
+msgstr "簽名選項："
+
+#: build/build.c:121 build/pack.c:405
 msgid "Unable to open temp file.\n"
 msgstr "無法開啟暫時檔案。\n"
 
-#: build/build.c:181
+#: build/build.c:169
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "正在執行 (%s)：%s\n"
 
-#: build/build.c:187
+#: build/build.c:175
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "執行 %s 失敗 (%s)：%s\n"
 
-#: build/build.c:196
+#: build/build.c:184
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "來自 (%s) 錯誤的離開狀態 (%s)\n"
 
-#: build/build.c:297
+#: build/build.c:290
 msgid ""
 "\n"
 "\n"
@@ -706,32 +736,32 @@ msgstr "不容許以萬用字元解析：%s\n"
 msgid "File not found by glob: %s\n"
 msgstr "以萬用字元解析找不到檔案：%s\n"
 
-#: build/files.c:1740
+#: build/files.c:1736
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "無法開啟 %%files 的檔案 %s: %s\n"
 
-#: build/files.c:1748
+#: build/files.c:1744
 #, c-format
 msgid "line: %s\n"
 msgstr "列：%s\n"
 
-#: build/files.c:2036
+#: build/files.c:2020
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "損壞的檔案：%s：%s\n"
 
-#: build/files.c:2058 build/parsePrep.c:32
+#: build/files.c:2042 build/parsePrep.c:32
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "損壞的所有者/組別：%s\n"
 
-#: build/files.c:2099
+#: build/files.c:2082
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "正在檢查未被打包的檔案：%s\n"
 
-#: build/files.c:2114
+#: build/files.c:2097
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -740,12 +770,12 @@ msgstr ""
 "發現被安裝但未被打包的檔案：\n"
 "%s"
 
-#: build/files.c:2139
+#: build/files.c:2122
 #, fuzzy, c-format
 msgid "Processing files: %s\n"
 msgstr "正在處理檔案：%s-%s-%s\n"
 
-#: build/files.c:2150
+#: build/files.c:2133
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -964,30 +994,30 @@ msgstr "%%changelog 中漏失了名稱\n"
 msgid "no description in %%changelog\n"
 msgstr "%%changelog 中沒有更新說明\n"
 
-#: build/parseDescription.c:33
+#: build/parseDescription.c:32
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "列 %d：解析 %%description 時發生錯誤：%s\n"
 
-#: build/parseDescription.c:46 build/parseFiles.c:43 build/parsePolicies.c:45
+#: build/parseDescription.c:45 build/parseFiles.c:43 build/parsePolicies.c:45
 #: build/parseScript.c:232
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "列 %d：損壞的選項 %s：%s\n"
 
-#: build/parseDescription.c:57 build/parseFiles.c:54 build/parsePolicies.c:55
+#: build/parseDescription.c:56 build/parseFiles.c:54 build/parsePolicies.c:55
 #: build/parseScript.c:243
 #, c-format
 msgid "line %d: Too many names: %s\n"
 msgstr "列 %d: 太多名稱：%s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:62 build/parsePolicies.c:62
+#: build/parseDescription.c:64 build/parseFiles.c:62 build/parsePolicies.c:62
 #: build/parseScript.c:251
 #, c-format
 msgid "line %d: Package does not exist: %s\n"
 msgstr "列 %d：套件不存在：%s\n"
 
-#: build/parseDescription.c:75
+#: build/parseDescription.c:74
 #, c-format
 msgid "line %d: Second description\n"
 msgstr "列 %d：重複的 description\n"
@@ -1072,97 +1102,97 @@ msgstr "無法讀取圖示 %s：%s\n"
 msgid "Unknown icon type: %s\n"
 msgstr "不明的圖示類型：%s\n"
 
-#: build/parsePreamble.c:614
+#: build/parsePreamble.c:590
 #, c-format
 msgid "line %d: Tag takes single token only: %s\n"
 msgstr "列 %d: 標記只需單一符記：%s\n"
 
-#: build/parsePreamble.c:634
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Illegal char '%c' in: %s\n"
 msgstr "列 %d：在 %s 中出現違規字元「-」：%s\n"
 
-#: build/parsePreamble.c:637
+#: build/parsePreamble.c:613
 #, fuzzy, c-format
 msgid "line %d: Illegal char in: %s\n"
 msgstr "列 %d：在 %s 中出現違規字元「-」：%s\n"
 
-#: build/parsePreamble.c:643
+#: build/parsePreamble.c:619
 #, fuzzy, c-format
 msgid "line %d: Illegal sequence \"..\" in: %s\n"
 msgstr "列 %d：在 %s 中出現違規字元「-」：%s\n"
 
-#: build/parsePreamble.c:668
+#: build/parsePreamble.c:644
 #, c-format
 msgid "line %d: Malformed tag: %s\n"
 msgstr "列 %d: 異常的標記：%s\n"
 
-#: build/parsePreamble.c:676
+#: build/parsePreamble.c:652
 #, c-format
 msgid "line %d: Empty tag: %s\n"
 msgstr "列 %d: 清空標記：%s\n"
 
-#: build/parsePreamble.c:734
+#: build/parsePreamble.c:709
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s\n"
 msgstr "列 %d：Prefixes 不能以「/」結尾：%s\n"
 
-#: build/parsePreamble.c:747
+#: build/parsePreamble.c:722
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s\n"
 msgstr "列 %d：Docdir 必須以「/」開頭：%s\n"
 
-#: build/parsePreamble.c:760
+#: build/parsePreamble.c:735
 #, fuzzy, c-format
 msgid "line %d: Epoch field must be an unsigned number: %s\n"
 msgstr "列 %d：Epoch/Serial 欄位的內容必須是一個數字：%s\n"
 
-#: build/parsePreamble.c:800
+#: build/parsePreamble.c:775
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s\n"
 msgstr "列 %d: 不當的 %s: 限定詞：%s\n"
 
-#: build/parsePreamble.c:827
+#: build/parsePreamble.c:802
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s\n"
 msgstr "列 %d：損壞的組建架構格式：%s\n"
 
-#: build/parsePreamble.c:837
+#: build/parsePreamble.c:812
 #, c-format
 msgid "line %d: Only noarch subpackages are supported: %s\n"
 msgstr ""
 
-#: build/parsePreamble.c:852
+#: build/parsePreamble.c:827
 #, c-format
 msgid "Internal error: Bogus tag %d\n"
 msgstr "內部錯誤：假造的標記 %d\n"
 
-#: build/parsePreamble.c:935
+#: build/parsePreamble.c:910
 #, fuzzy, c-format
 msgid "line %d: %s is deprecated: %s\n"
 msgstr "列 %d：需要版本描述：%s\n"
 
-#: build/parsePreamble.c:998
+#: build/parsePreamble.c:973
 #, c-format
 msgid "Bad package specification: %s\n"
 msgstr "不當的套件規格：%s\n"
 
-#: build/parsePreamble.c:1004
+#: build/parsePreamble.c:979
 #, c-format
 msgid "Package already exists: %s\n"
 msgstr "套件已存在：%s\n"
 
-#: build/parsePreamble.c:1035
+#: build/parsePreamble.c:1010
 #, c-format
 msgid "line %d: Unknown tag: %s\n"
 msgstr "列 %d：不明標記：%s\n"
 
-#: build/parsePreamble.c:1067
+#: build/parsePreamble.c:1042
 #, fuzzy, c-format
 msgid "%%{buildroot} couldn't be empty\n"
 msgstr "BuildRoot 不能是「/」：%s\n"
 
-#: build/parsePreamble.c:1071
+#: build/parsePreamble.c:1046
 #, fuzzy, c-format
 msgid "%%{buildroot} can not be \"/\"\n"
 msgstr "BuildRoot 不能是「/」：%s\n"
@@ -1222,7 +1252,7 @@ msgstr "%s：%s\n"
 msgid "Invalid patch number %s: %s\n"
 msgstr "不正確的套件編號：%s\n"
 
-#: build/parsePrep.c:497
+#: build/parsePrep.c:495
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "列 %d：重複的 %%prep\n"
@@ -1293,31 +1323,31 @@ msgstr "無法開啟 %s：%s\n"
 msgid "Unclosed %%if\n"
 msgstr "%%if 分支未關閉\n"
 
-#: build/parseSpec.c:347
+#: build/parseSpec.c:338
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d\n"
 msgstr "%s:%d: parseExpressionBoolean 回傳 %d\n"
 
-#: build/parseSpec.c:356
+#: build/parseSpec.c:347
 #, c-format
 msgid "%s:%d: Got a %%else with no %%if\n"
 msgstr "%s:%d：缺少與 %%if 對應的 %%if\n"
 
-#: build/parseSpec.c:368
+#: build/parseSpec.c:359
 #, c-format
 msgid "%s:%d: Got a %%endif with no %%if\n"
 msgstr "%s:%d：缺少與 %%endif 對應的 %%if\n"
 
-#: build/parseSpec.c:382 build/parseSpec.c:391
+#: build/parseSpec.c:373 build/parseSpec.c:382
 #, c-format
 msgid "malformed %%include statement\n"
 msgstr "異常的 %%include 宣告\n"
 
-#: build/parseSpec.c:633
+#: build/parseSpec.c:624
 msgid "No compatible architectures found for build\n"
 msgstr "沒有可供組建的相容硬體架構\n"
 
-#: build/parseSpec.c:667
+#: build/parseSpec.c:658
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "套件沒有 %%description：%s\n"
@@ -1364,27 +1394,27 @@ msgid ""
 "'%s'.\n"
 msgstr ""
 
-#: build/policies.c:248
+#: build/policies.c:245
 #, fuzzy, c-format
 msgid "Error parsing %s: %s\n"
 msgstr "解析 %%setup 時發生錯誤：%s\n"
 
-#: build/policies.c:254
+#: build/policies.c:251
 #, fuzzy, c-format
 msgid "Expecting %%semodule tag: %s\n"
 msgstr "正在執行 (%s)：%s\n"
 
-#: build/policies.c:264
+#: build/policies.c:261
 #, fuzzy, c-format
 msgid "Missing module path in line: %s\n"
 msgstr "在 %s %s 中有缺失的「%s」\n"
 
-#: build/policies.c:270
+#: build/policies.c:267
 #, fuzzy, c-format
 msgid "Too many arguments in line: %s\n"
 msgstr "在資料列的 %s:%d 中有太多引數\n"
 
-#: build/policies.c:309
+#: build/policies.c:305
 #, fuzzy, c-format
 msgid "Processing policies: %s\n"
 msgstr "正在處理檔案：%s-%s-%s\n"
@@ -1409,7 +1439,7 @@ msgstr "無法執行 %s: %s\n"
 msgid "Couldn't exec %s: %s\n"
 msgstr "無法執行 %s: %s\n"
 
-#: build/rpmfc.c:224 lib/rpmscript.c:235
+#: build/rpmfc.c:224 lib/rpmscript.c:239
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "無法開啟 %s：%s\n"
@@ -1459,7 +1489,7 @@ msgstr "檔案 %s: %s\n"
 msgid "Failed to find %s:\n"
 msgstr "讀取 %s 失敗: %s。\n"
 
-#: build/spec.c:444
+#: build/spec.c:410
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "規格檔 %s 的查詢失敗，無法剖析\n"
@@ -1736,91 +1766,99 @@ msgstr "%s 無法安裝\n"
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/poptALL.c:165
+#: lib/poptALL.c:163
 msgid "predefine MACRO with value EXPR"
 msgstr "預先以值 EXPR 定義巨集"
 
-#: lib/poptALL.c:166 lib/poptALL.c:169
+#: lib/poptALL.c:164 lib/poptALL.c:167
 msgid "'MACRO EXPR'"
 msgstr "「巨集 EXPR」"
 
-#: lib/poptALL.c:168
+#: lib/poptALL.c:166
 msgid "define MACRO with value EXPR"
 msgstr "定義巨集附有值 EXPR"
 
-#: lib/poptALL.c:171
+#: lib/poptALL.c:169
 msgid "print macro expansion of EXPR"
 msgstr "印出巨集展開的 EXPR"
 
-#: lib/poptALL.c:172
+#: lib/poptALL.c:170
 msgid "'EXPR'"
 msgstr "「EXPR」"
 
-#: lib/poptALL.c:174 lib/poptALL.c:189 lib/poptALL.c:193
+#: lib/poptALL.c:172 lib/poptALL.c:186
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "讀取 <檔案:…> 以代替預設檔案"
 
-#: lib/poptALL.c:175 lib/poptALL.c:190 lib/poptALL.c:194
+#: lib/poptALL.c:173 lib/poptALL.c:187
 msgid "<FILE:...>"
 msgstr "<檔案:…>"
 
-#: lib/poptALL.c:178
+#: lib/poptALL.c:176
 msgid "don't verify package digest(s)"
 msgstr "不校驗套件摘要"
 
-#: lib/poptALL.c:180
+#: lib/poptALL.c:178
 msgid "don't verify database header(s) when retrieved"
 msgstr "取回時不驗證資料庫表頭"
 
-#: lib/poptALL.c:182
+#: lib/poptALL.c:180
 msgid "don't verify package signature(s)"
 msgstr "不校驗套件簽名"
 
-#: lib/poptALL.c:185
+#: lib/poptALL.c:183
 msgid "send stdout to CMD"
 msgstr "發送標準輸出到 CMD"
 
-#: lib/poptALL.c:186
+#: lib/poptALL.c:184
 msgid "CMD"
 msgstr "CMD"
 
-#: lib/poptALL.c:197
+#: lib/poptALL.c:189
 msgid "use ROOT as top level directory"
 msgstr "使用 ROOT 做為頂層目錄"
 
-#: lib/poptALL.c:198
+#: lib/poptALL.c:190
 msgid "ROOT"
 msgstr "ROOT"
 
-#: lib/poptALL.c:201
+#: lib/poptALL.c:192
+msgid "use database in DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "DIRECTORY"
+msgstr ""
+
+#: lib/poptALL.c:196
 msgid "display known query tags"
 msgstr "顯示已知的查詢標記"
 
-#: lib/poptALL.c:203
+#: lib/poptALL.c:198
 msgid "display final rpmrc and macro configuration"
 msgstr "顯示完整的 rpmrc 與巨集定義配置"
 
-#: lib/poptALL.c:205
+#: lib/poptALL.c:200
 msgid "provide less detailed output"
 msgstr "提供較少的細節輸出"
 
-#: lib/poptALL.c:207
+#: lib/poptALL.c:202
 msgid "provide more detailed output"
 msgstr "提供較多的細節輸出"
 
-#: lib/poptALL.c:209
+#: lib/poptALL.c:204
 msgid "print the version of rpm being used"
 msgstr "印出正在使用的 rpm 版本資訊"
 
-#: lib/poptALL.c:215
+#: lib/poptALL.c:210
 msgid "debug payload file state machine"
 msgstr "對酬載檔案狀態機器除錯"
 
-#: lib/poptALL.c:221
+#: lib/poptALL.c:216
 msgid "debug rpmio I/O"
 msgstr "對 rpmio I/O 除錯"
 
-#: lib/poptALL.c:297
+#: lib/poptALL.c:295
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: 選項表格 misconfigured(%d)\n"
@@ -1841,214 +1879,210 @@ msgstr "重新部署引數必須包含一個「=」"
 msgid "relocations must have a / following the ="
 msgstr "重新部署引數中必須有一個在「=」後的「/」"
 
-#: lib/poptI.c:113
+#: lib/poptI.c:114
 msgid "add suggested packages to transaction"
 msgstr "加入建議的套件到異動作業"
 
-#: lib/poptI.c:117
+#: lib/poptI.c:118
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "安裝所有檔案，即使配置檔案可能會被略過"
 
-#: lib/poptI.c:121
+#: lib/poptI.c:122
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 "移除所有匹配<套件>的套件 (如果<套件>被指定為多個套件，常會導致錯誤出現)"
 
-#: lib/poptI.c:127 lib/poptI.c:206
+#: lib/poptI.c:128 lib/poptI.c:204
 msgid "do not execute package scriptlet(s)"
 msgstr "不執行套件內建短命令稿"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:132
 msgid "relocate files in non-relocatable package"
 msgstr "對不可重新部署的套件重新部署檔案"
 
-#: lib/poptI.c:135
+#: lib/poptI.c:136
 msgid "print dependency loops as warning"
 msgstr "印出循環的相依關係做為警告"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "erase (uninstall) package"
 msgstr "清除(反安裝)套件"
 
-#: lib/poptI.c:139
+#: lib/poptI.c:140
 msgid "<package>+"
 msgstr "<套件>+"
 
-#: lib/poptI.c:142 lib/poptI.c:182
+#: lib/poptI.c:143 lib/poptI.c:180
 msgid "do not install configuration files"
 msgstr "不安裝配置檔案"
 
-#: lib/poptI.c:145 lib/poptI.c:187
+#: lib/poptI.c:146 lib/poptI.c:185
 msgid "do not install documentation"
 msgstr "不安裝文件"
 
-#: lib/poptI.c:147
+#: lib/poptI.c:148
 msgid "skip files with leading component <path> "
 msgstr "略過指定的 <路徑> 後的檔案 "
 
-#: lib/poptI.c:148
+#: lib/poptI.c:149
 msgid "<path>"
 msgstr "<路徑>"
 
 #: lib/poptI.c:152
-msgid "detect file conflicts between packages"
-msgstr "在套件之間偵測會衝突的檔案"
-
-#: lib/poptI.c:154
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs 與 --replacefiles 的速寫"
 
-#: lib/poptI.c:158
+#: lib/poptI.c:156
 msgid "upgrade package(s) if already installed"
 msgstr "如果套件已安裝，執行更新"
 
-#: lib/poptI.c:159 lib/poptI.c:175 lib/poptI.c:264
+#: lib/poptI.c:157 lib/poptI.c:173 lib/poptI.c:262
 msgid "<packagefile>+"
 msgstr "<套件檔案>+"
 
-#: lib/poptI.c:161
+#: lib/poptI.c:159
 msgid "print hash marks as package installs (good with -v)"
 msgstr "印出出安裝套件的 Hash 碼 (常和 -v 同時使用)"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:162
 msgid "don't verify package architecture"
 msgstr "不偵測套件的相容架構"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:165
 msgid "don't verify package operating system"
 msgstr "不偵測套件的相容作業系統"
 
-#: lib/poptI.c:170
+#: lib/poptI.c:168
 msgid "don't check disk space before installing"
 msgstr "安裝前不偵測磁碟剩餘空間"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:170
 msgid "install documentation"
 msgstr "安裝文件"
 
-#: lib/poptI.c:175
+#: lib/poptI.c:173
 msgid "install package(s)"
 msgstr "安裝套件"
 
-#: lib/poptI.c:178
+#: lib/poptI.c:176
 msgid "update the database, but do not modify the filesystem"
 msgstr "僅更新資料庫，但不對檔案系統進行修改"
 
-#: lib/poptI.c:184
+#: lib/poptI.c:182
 msgid "do not verify package dependencies"
 msgstr "不偵測套件相依性"
 
-#: lib/poptI.c:190 lib/poptQV.c:210 lib/poptQV.c:212
+#: lib/poptI.c:188 lib/poptQV.c:210 lib/poptQV.c:212
 #, fuzzy
 msgid "don't verify digest of files"
 msgstr "不校驗檔案的 MD5 碼值"
 
-#: lib/poptI.c:192
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify digest of files (obsolete)"
 msgstr "不校驗檔案的 MD5 碼值"
 
-#: lib/poptI.c:194
+#: lib/poptI.c:192
 msgid "don't install file security contexts"
 msgstr "不安裝檔案安全上下文"
 
-#: lib/poptI.c:198
+#: lib/poptI.c:196
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "不重新排列套件安裝順序以滿足相依鏈"
 
-#: lib/poptI.c:203
+#: lib/poptI.c:201
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "不給出相依性解決方案的建議"
 
-#: lib/poptI.c:210
+#: lib/poptI.c:208
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "不執行預先安裝短命令稿(如果存在)"
 
-#: lib/poptI.c:213
+#: lib/poptI.c:211
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "不執行安裝後短命令稿(如果存在)"
 
-#: lib/poptI.c:216
+#: lib/poptI.c:214
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "不執行預先安裝短命令稿(如果存在)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:217
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "不執行預先安裝短命令稿(如果存在)"
 
-#: lib/poptI.c:222
+#: lib/poptI.c:220
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "不執行套件內的任何可觸發短命令稿"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:223
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "不執行任何預先作業觸發執行的短命令稿"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:226
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "不執行任何安裝中觸發執行的短命令稿"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:229
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "不執行任何清除中觸發執行的短命令稿"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "不執行任何作業後觸發執行的短命令稿"
 
-#: lib/poptI.c:238
+#: lib/poptI.c:236
 msgid "do not perform any collection actions"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:240
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr "更新到一個舊版本的套件 (在更新作業中 --force 指令會自動進行此步驟)"
 
-#: lib/poptI.c:246
+#: lib/poptI.c:244
 msgid "print percentages as package installs"
 msgstr "安裝套件時印出進度百分比"
 
-#: lib/poptI.c:248
+#: lib/poptI.c:246
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "如果可以，把套件重新部署到 <目錄>"
 
-#: lib/poptI.c:249
+#: lib/poptI.c:247
 msgid "<dir>"
 msgstr "<目錄>"
 
-#: lib/poptI.c:251
+#: lib/poptI.c:249
 msgid "relocate files from path <old> to <new>"
 msgstr "將檔案從 <舊目錄> 重新部署到 <新目錄>"
 
-#: lib/poptI.c:252
+#: lib/poptI.c:250
 msgid "<old>=<new>"
 msgstr "<舊目錄>=<新目錄>"
 
-#: lib/poptI.c:255
+#: lib/poptI.c:253
 msgid "ignore file conflicts between packages"
 msgstr "忽略套件之間的檔案衝突"
 
-#: lib/poptI.c:258
+#: lib/poptI.c:256
 msgid "reinstall if the package is already present"
 msgstr "如果套件已存在則重新安裝"
 
-#: lib/poptI.c:260
+#: lib/poptI.c:258
 msgid "don't install, but tell if it would work or not"
 msgstr "不真正安裝，只回報作業結果是否正確"
 
-#: lib/poptI.c:263
+#: lib/poptI.c:261
 msgid "upgrade package(s)"
 msgstr "更新套件"
 
@@ -2137,10 +2171,6 @@ msgstr "列出套件內的檔案"
 msgid "skip %%ghost files"
 msgstr "略過 %%ghost 檔案"
 
-#: lib/poptQV.c:195
-msgid "use the following query format"
-msgstr "使用以下的查詢格式"
-
 #: lib/poptQV.c:197
 msgid "display the states of the listed files"
 msgstr "顯示列出的每個檔案的狀態"
@@ -2754,31 +2784,31 @@ msgstr ""
 msgid "Unable to open %s for reading: %m.\n"
 msgstr "無法開啟 %s 以讀取：%s\n"
 
-#: lib/rpmscript.c:72
+#: lib/rpmscript.c:76
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
-#: lib/rpmscript.c:185
+#: lib/rpmscript.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary file for %s: %s\n"
 msgstr "無法開啟 %s：%s\n"
 
-#: lib/rpmscript.c:222
+#: lib/rpmscript.c:226
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor: %s: %s\n"
 msgstr "無法開啟 %s：%s\n"
 
-#: lib/rpmscript.c:245
+#: lib/rpmscript.c:249
 #, fuzzy, c-format
 msgid "%s scriptlet failed, waitpid(%d) rc %d: %s\n"
 msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗，waitpid(%d) rc %d: %s\n"
 
-#: lib/rpmscript.c:249
+#: lib/rpmscript.c:253
 #, fuzzy, c-format
 msgid "%s scriptlet failed, signal %d\n"
 msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗，離開狀態 %d\n"
 
-#: lib/rpmscript.c:252
+#: lib/rpmscript.c:256
 #, fuzzy, c-format
 msgid "%s scriptlet failed, exit status %d\n"
 msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗，離開狀態 %d\n"
@@ -2788,12 +2818,12 @@ msgstr "%s(%s-%s-%s.%s) 短命令稿執行失敗，離開狀態 %d\n"
 msgid "Unknown format"
 msgstr "不明的標記"
 
-#: lib/rpmte.c:809
+#: lib/rpmte.c:817
 #, fuzzy
 msgid "install"
 msgstr "(已安裝) "
 
-#: lib/rpmte.c:810
+#: lib/rpmte.c:818
 msgid "erase"
 msgstr ""
 
@@ -2897,11 +2927,11 @@ msgstr "驗證簽名：不當的參數\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "簽名：不明 (%d)\n"
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1395
+#: lib/transaction.c:1382
 #, fuzzy
 msgid "failed"
 msgstr "%s 失敗：%s\n"
@@ -2976,142 +3006,132 @@ msgstr "| 預期於運算式的結束"
 msgid "array iterator used with different sized arrays"
 msgstr "用於不同大小陣列的陣列迭代器"
 
-#: lib/rpmdb.c:124
+#: lib/rpmdb.c:123
 #, c-format
 msgid "Generating %d missing index(es), please wait...\n"
 msgstr ""
 
-#: lib/rpmdb.c:185
-#, c-format
-msgid "dbiOpen: dbapi %d not available\n"
-msgstr ""
-
-#: lib/rpmdb.c:195
+#: lib/rpmdb.c:182
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "無法使用資料庫 %2$d- %3$s(%4$d) 開啟 %1$s 索引\n"
 
-#: lib/rpmdb.c:727
+#: lib/rpmdb.c:708
 msgid "no dbpath has been set\n"
 msgstr "沒有 dbpath 已被設定\n"
 
-#: lib/rpmdb.c:923 lib/rpmdb.c:1041 lib/rpmdb.c:1086 lib/rpmdb.c:1948
-#: lib/rpmdb.c:2068 lib/rpmdb.c:2103 lib/rpmdb.c:2663
+#: lib/rpmdb.c:891 lib/rpmdb.c:1009 lib/rpmdb.c:1054 lib/rpmdb.c:1916
+#: lib/rpmdb.c:2069 lib/rpmdb.c:2104 lib/rpmdb.c:2666
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "從 %3$s 索引取得 \"%2$s\" 記錄時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:1273
+#: lib/rpmdb.c:1241
 msgid "miFreeHeader: skipping"
 msgstr "miFreeHeader：跳過"
 
-#: lib/rpmdb.c:1283
+#: lib/rpmdb.c:1251
 #, c-format
 msgid "error(%d) storing record #%d into %s\n"
 msgstr "儲存記錄 #%2$d 進入 %3$s 時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:1381
+#: lib/rpmdb.c:1349
 #, fuzzy, c-format
 msgid "%s: regexec failed: %s\n"
 msgstr "%s：檢索失敗：%s\n"
 
-#: lib/rpmdb.c:1562
+#: lib/rpmdb.c:1530
 #, fuzzy, c-format
 msgid "%s: regcomp failed: %s\n"
 msgstr "%s：開啟失敗：%s\n"
 
-#: lib/rpmdb.c:1726
+#: lib/rpmdb.c:1694
 msgid "rpmdbNextIterator: skipping"
 msgstr "rpmdbNextIterator：跳過"
 
-#: lib/rpmdb.c:1871
+#: lib/rpmdb.c:1839
 #, c-format
 msgid "rpmdb: damaged header #%u retrieved -- skipping.\n"
 msgstr "rpmdb：已取回損壞的表頭 #%u -- 跳過。\n"
 
-#: lib/rpmdb.c:2275
+#: lib/rpmdb.c:2261
 #, fuzzy, c-format
 msgid "error(%d:%s) getting next key from %s index\n"
 msgstr "從 %3$s 索引取得 \"%2$s\" 記錄時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:2363
+#: lib/rpmdb.c:2367
 #, fuzzy, c-format
 msgid "error(%d) adding header #%d record\n"
 msgstr "設定用於 %3$s 撤除的表頭 #%2$d 記錄時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:2373
+#: lib/rpmdb.c:2377
 #, fuzzy, c-format
 msgid "error(%d) removing header #%d record\n"
 msgstr "設定用於 %3$s 撤除的表頭 #%2$d 記錄時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:2398
+#: lib/rpmdb.c:2401
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 無法讀取在 0x%x 的表頭\n"
 
-#: lib/rpmdb.c:2465
+#: lib/rpmdb.c:2468
 #, c-format
 msgid "error(%d) setting \"%s\" records from %s index\n"
 msgstr "從 %3$s 索引設定 \"%2$s\" 記錄時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:2484
+#: lib/rpmdb.c:2487
 #, c-format
 msgid "error(%d) storing record \"%s\" into %s\n"
 msgstr "儲存記錄 \"%2$s\" 進入 %3$s 時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:2494
+#: lib/rpmdb.c:2497
 #, c-format
 msgid "error(%d) removing record \"%s\" from %s\n"
 msgstr "從 %3$s 移除記錄 \"%2$s\" 時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:2570
+#: lib/rpmdb.c:2573
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "配置新套件實體時產生錯誤(%d)\n"
 
-#: lib/rpmdb.c:2679
+#: lib/rpmdb.c:2682
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "儲存記錄 %2$s 於 %3$s 時產生錯誤(%1$d)\n"
 
-#: lib/rpmdb.c:2910
+#: lib/rpmdb.c:2879
 msgid "no dbpath has been set"
 msgstr "沒有 dbpath 已被設定"
 
-#: lib/rpmdb.c:2934
-#, c-format
-msgid "temporary database %s already exists\n"
-msgstr "臨時資料庫 %s 已經存在\n"
-
-#: lib/rpmdb.c:2942
+#: lib/rpmdb.c:2897
 #, fuzzy, c-format
 msgid "failed to create directory %s: %s\n"
 msgstr "移除目錄時失敗 %s: %s\n"
 
-#: lib/rpmdb.c:2983
+#: lib/rpmdb.c:2931
 #, c-format
 msgid "header #%u in the database is bad -- skipping.\n"
 msgstr "在資料庫中有不當的表頭 #%u -- 跳過。\n"
 
-#: lib/rpmdb.c:2997
+#: lib/rpmdb.c:2945
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "無法加入原本在 %u 的記錄\n"
 
-#: lib/rpmdb.c:3012
+#: lib/rpmdb.c:2960
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "重建資料庫時失敗：原來的資料庫保持原狀\n"
 
-#: lib/rpmdb.c:3020
+#: lib/rpmdb.c:2968
 msgid "failed to replace old database with new database!\n"
 msgstr "以新的資料庫取代舊的資料庫時失敗！\n"
 
-#: lib/rpmdb.c:3022
+#: lib/rpmdb.c:2970
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "以 %2$s 的檔案取代 %1$s 中的檔案來回復"
 
-#: lib/rpmdb.c:3034
+#: lib/rpmdb.c:2981
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "移除目錄時失敗 %s: %s\n"
@@ -3346,27 +3366,27 @@ msgstr "檔案 %s 小於 %u 位元組\n"
 msgid "failed to create directory"
 msgstr "移除目錄時失敗 %s: %s\n"
 
-#: rpmio/rpmlua.c:461
+#: rpmio/rpmlua.c:462
 #, fuzzy, c-format
 msgid "invalid syntax in lua scriptlet: %s\n"
 msgstr "不支援舊語法：%s\n"
 
-#: rpmio/rpmlua.c:477
+#: rpmio/rpmlua.c:478
 #, fuzzy, c-format
 msgid "invalid syntax in lua script: %s\n"
 msgstr "不支援舊語法：%s\n"
 
-#: rpmio/rpmlua.c:482 rpmio/rpmlua.c:501
+#: rpmio/rpmlua.c:483 rpmio/rpmlua.c:502
 #, fuzzy, c-format
 msgid "lua script failed: %s\n"
 msgstr "%s: Fwrite 失敗：%s\n"
 
-#: rpmio/rpmlua.c:496
+#: rpmio/rpmlua.c:497
 #, fuzzy, c-format
 msgid "invalid syntax in lua file: %s\n"
 msgstr "不正確的套件編號：%s\n"
 
-#: rpmio/rpmlua.c:662
+#: rpmio/rpmlua.c:663
 #, fuzzy, c-format
 msgid "lua hook failed: %s\n"
 msgstr "%s：檢索失敗：%s\n"
@@ -3469,12 +3489,25 @@ msgstr "%s: 讀取清單失敗：%s\n"
 msgid "don't verify header+payload signature"
 msgstr "不驗證表頭+酬載簽名"
 
+#~ msgid ""
+#~ "--nodeps may only be specified during package building, rebuilding, "
+#~ "recompilation, installation,erasure, and verification"
+#~ msgstr "--nodeps 選項只能在套件的組建、重建、重編譯、安裝、清除和校驗時指定"
+
+#~ msgid ""
+#~ "--root (-r) may only be specified during installation, erasure, querying, "
+#~ "and database rebuilds"
+#~ msgstr "--root(-r) 選項只能在套件的安裝、清除、查詢和資料庫重建時指定"
+
+#~ msgid "detect file conflicts between packages"
+#~ msgstr "在套件之間偵測會衝突的檔案"
+
+#~ msgid "temporary database %s already exists\n"
+#~ msgstr "臨時資料庫 %s 已經存在\n"
+
 #~ msgid "query/verify package(s) with file identifier"
 #~ msgstr "根據檔案識別查詢/校驗套件"
 
-#~ msgid "query a spec file"
-#~ msgstr "查詢一個規格檔案"
-
 #~ msgid "<spec>"
 #~ msgstr "<規格檔>"
 
@@ -3487,12 +3520,6 @@ msgstr "不驗證表頭+酬載簽名"
 #~ msgid "Target buffer overflow\n"
 #~ msgstr "目標緩衝區溢位\n"
 
-#~ msgid "Signature options:"
-#~ msgstr "簽名選項："
-
-#~ msgid "Database options:"
-#~ msgstr "資料庫選項："
-
 #~ msgid "no files to sign\n"
 #~ msgstr "沒有要簽名的檔案\n"